← Back to team overview

openerp-chinese-team team mailing list archive

lp:~openerp-chinese-team/openobject-addons/7.0-purchase-view-bug-fix into lp:openobject-addons

 

Joshua Jan(SHINEIT) has proposed merging lp:~openerp-chinese-team/openobject-addons/7.0-purchase-view-bug-fix into lp:openobject-addons.

Requested reviews:
  OpenERP R&D Addons Team 2 (openerp-dev-addons2)
Related bugs:
  Bug #1250305 in OpenERP Addons: "[7.0][Trunk][Typo error]purchase/purchase_view.xml  'attr' should be 'attrs'"
  https://bugs.launchpad.net/openobject-addons/+bug/1250305

For more details, see:
https://code.launchpad.net/~openerp-chinese-team/openobject-addons/7.0-purchase-view-bug-fix/+merge/194857

purchase module typo corrected
-- 
The attached diff has been truncated due to its size.
https://code.launchpad.net/~openerp-chinese-team/openobject-addons/7.0-purchase-view-bug-fix/+merge/194857
Your team Open ERP Chinese is subscribed to branch lp:~openerp-chinese-team/openobject-addons/7.0-purchase-view-bug-fix.
=== modified file 'account/i18n/bs.po'
--- account/i18n/bs.po	2013-09-12 06:40:18 +0000
+++ account/i18n/bs.po	2013-11-12 13:23:09 +0000
@@ -4,17 +4,31 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:18+0000\n"
 "Last-Translator: Fabien (Open ERP) <fp@xxxxxxxxxxx>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-14 22:29+0000\n"
+"PO-Revision-Date: 2013-10-27 22:14+0000\n"
+"Last-Translator: Bosko Stojakovic <bluesoft83@xxxxxxxxx>\n"
+"Language-Team: Bosnian <bs@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-09-12 05:23+0000\n"
 "X-Generator: Launchpad (build 16761)\n"
+=======
+"X-Launchpad-Export-Date: 2013-10-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16810)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -26,6 +40,7 @@
 msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
+"Fiskalna pozicija konta može biti definisana samo jednom za neka konta."
 
 #. module: account
 #: help:account.tax.code,sequence:0
@@ -39,7 +54,7 @@
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
-msgstr ""
+msgstr "Zatvaranje stavki dnevnika"
 
 #. module: account
 #: view:account.account:0
@@ -341,7 +356,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "Poništavajne zatvaranja konta"
 
 #. module: account
 #: field:account.config.settings,module_account_budget:0
@@ -456,18 +471,25 @@
 "this box, you will be able to do invoicing & payments,\n"
 "                but not accounting (Journal Items, Chart of Accounts, ...)"
 msgstr ""
+"Ovo vam omogućuje upravljanje imovinom u vlasništvu kompanije ili osobe.\n"
+"                              Prati amortizaciju na tim sredstvima, i stvara "
+"kretanja konta za knjiženje amortizacije.\n"
+"                              Ovo instalira modul account_asset. Ako ne "
+"označite ovo polje, moći ćete raditi fakture\n"
+"                              i plaćanja ali ne i računovodstvo (dnevnici "
+"knjiženja, kontni plan...)"
 
 #. module: account
 #: help:account.bank.statement.line,name:0
 msgid "Originator to Beneficiary Information"
-msgstr ""
+msgstr "Informacije o pokretaču i korisniku"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
 #, python-format
 msgid "Period :"
-msgstr ""
+msgstr "Period :"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -480,7 +502,7 @@
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: create refund, reconcile and create a new draft invoice"
-msgstr ""
+msgstr "Uredi: napravi povrat, zatvori ili kreiraj novu fakturu u pripremi"
 
 #. module: account
 #: help:account.config.settings,tax_calculation_rounding_method:0
@@ -494,6 +516,15 @@
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Ukoliko odavberete 'Zaokruži po liniji' : za svaki porez, iznos poreza će "
+"prvo biti izračunat i zaokružen po svakoj stavci, i nakon toga svi iznosi će "
+"biti zbrojeni do ukupnog iznosa poreza. \r\n"
+"Ukoliko odaberete 'Zaokruži globalno' : za svaki porez, iznos poreza će biti "
+"izračunat po svakoj stavci, ti iznosi će biti zbrojeni, i eventualno ukupni "
+"iznos poreza će biti zaokružen. \r\n"
+"Ako vršite prodaju sa uključenim porezom trebali bi odabrati 'Zaokruži po "
+"liniji' jer svakako želite da suma uključenih poreza po stavkama odgovara "
+"ukupnom iznosu poreza uračunatom u cijenu."
 
 #. module: account
 #: model:ir.model,name:account.model_wizard_multi_charts_accounts
@@ -508,12 +539,12 @@
 #. module: account
 #: view:account.journal:0
 msgid "Available Coins"
-msgstr ""
+msgstr "Raspoložive monete"
 
 #. module: account
 #: field:accounting.report,enable_filter:0
 msgid "Enable Comparison"
-msgstr ""
+msgstr "Omogući uspoređivanje"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -551,22 +582,22 @@
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
 msgid "Confirm the selected invoices"
-msgstr ""
+msgstr "Potvrdi odabrane fakture"
 
 #. module: account
 #: field:account.addtmpl.wizard,cparent_id:0
 msgid "Parent target"
-msgstr ""
+msgstr "Nadređeni cilj"
 
 #. module: account
 #: help:account.invoice.line,sequence:0
 msgid "Gives the sequence of this line when displaying the invoice."
-msgstr ""
+msgstr "Daje sekvencu ove linije kada se prikazuje faktura"
 
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr ""
+msgstr "Konto koji se koristi u ovom dnevniku"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -584,12 +615,12 @@
 #: help:account.vat.declaration,chart_account_id:0
 #: help:accounting.report,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "Odabir kontnog plana"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr ""
+msgstr "Povrat fakture"
 
 #. module: account
 #: report:account.overdue:0
@@ -605,7 +636,7 @@
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Protustavka"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -623,7 +654,7 @@
 #. module: account
 #: model:process.transition,note:account.process_transition_confirmstatementfromdraft0
 msgid "The accountant confirms the statement."
-msgstr ""
+msgstr "Knjigovođa potvrđuje izvod."
 
 #. module: account
 #. openerp-web
@@ -635,13 +666,13 @@
 #. module: account
 #: field:account.config.settings,decimal_precision:0
 msgid "Decimal precision on journal entries"
-msgstr ""
+msgstr "Decimalna preciznost na stavkama dnevnika"
 
 #. module: account
 #: selection:account.config.settings,period:0
 #: selection:account.installer,period:0
 msgid "3 Monthly"
-msgstr ""
+msgstr "Tromjesečno"
 
 #. module: account
 #: field:ir.sequence,fiscal_ids:0
@@ -652,7 +683,7 @@
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr ""
+msgstr "Vrijednost izvještaja"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:39
@@ -660,7 +691,7 @@
 msgid ""
 "Specified journal does not have any account move entries in draft state for "
 "this period."
-msgstr ""
+msgstr "Odabrani dnevnik nema kretanja konta u pripremi za ovaj period."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -671,35 +702,58 @@
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr ""
+msgstr "Centralizovani dnevnik"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
 msgid "Main Sequence must be different from current !"
-msgstr ""
+msgstr "Glavna sekvenca mora biti različita od trenutne !"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:64
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly."
-msgstr ""
+msgstr "Trenutna valuta nije ispravno postavljena"
 
 #. module: account
 #: field:account.journal,profit_account_id:0
 msgid "Profit Account"
-msgstr ""
+msgstr "Konto dobiti"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1156
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
-
-#. module: account
+"Nije nađen period za zadani datum ili je nađeno nekoliko perioda za zadani "
+"datum"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: help:res.partner,last_reconciliation_date:0
+msgid ""
+"Date on which the partner accounting entries were fully reconciled last "
+"time. It differs from the last date where a reconciliation has been made for "
+"this partner, as here we depict the fact that nothing more was to be "
+"reconciled at this date. This can be achieved in 2 different ways: either "
+"the last unreconciled debit/credit entry of this partner was reconciled, "
+"either the user pressed the button \"Nothing more to reconcile\" during the "
+"manual reconciliation process."
+msgstr ""
+"Datum kada su stavke partnera zadnji put potpuno zatvorene. Razlikuje se od "
+"zadnjeg datuma zatvaranja utoliko jer ovdje prikazujemo činjenicu da ne "
+"postoji ništa što bi se zatvaralo na ovaj datum. Može se postići na dva "
+"načina: ili je zadnja dugovo/potražna stavka za ovog partnera zatvorena ili "
+"je korisnik pritisnuo tipku \"Nema više stavaka za zatvaranje\" tokom "
+"procesa ručnog zatvaranja."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr ""
+msgstr "Izvještaj o prodaji po tipu konta"
 
 #. module: account
 #: code:addons/account/account.py:3201
@@ -711,7 +765,7 @@
 #: code:addons/account/account.py:1591
 #, python-format
 msgid "Cannot create move with currency different from .."
-msgstr ""
+msgstr "Nemože se kreirati kretanje sa valutom različitom od ..."
 
 #. module: account
 #: model:email.template,report_name:account.email_template_edi_invoice
@@ -729,7 +783,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr ""
+msgstr "Partnerski izvještaj zajedničkih konta"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -739,13 +793,26 @@
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
+msgstr "Period dnevnika"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: constraint:account.move.line:0
+msgid ""
+"The amount expressed in the secondary currency must be positive when the "
+"journal item is a debit and negative when if it is a credit."
 msgstr ""
+"Iznos izražen u sekundarnoj valuti mora biti pozitivan kada je stavka "
+"dnevnika dugovno i negativan ako je potražno."
 
 #. module: account
+>>>>>>> MERGE-SOURCE
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
 msgstr ""
+"Ne možete raditi više od jedne stavke po periodu na centraliziranom dnevniku."
 
 #. module: account
 #: help:account.tax,account_analytic_paid_id:0
@@ -754,6 +821,9 @@
 "lines for refunds. Leave empty if you don't want to use an analytic account "
 "on the invoice tax lines by default."
 msgstr ""
+"Postavite analitički konto koji će biti korišten kao zadani na stavkama "
+"poreza faktura za povrat. Ostavite prazno ako ne želite zadano koristiti "
+"analitički konto za poreze."
 
 #. module: account
 #: view:account.account:0
@@ -771,12 +841,12 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "Configure your company bank accounts"
-msgstr ""
+msgstr "Podesite bankovne račune vaše kompanije"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Create Refund"
-msgstr ""
+msgstr "Kreiraj povrat"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -784,11 +854,13 @@
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
 msgstr ""
+"Datum vašeg unosa u dnevnik nije u definisanom periodu! Trebali bi "
+"promijeniti datum ili ukloniti to ograničenje iz dnevnika."
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr ""
+msgstr "Izvještaj glavne knjige"
 
 #. module: account
 #: view:account.invoice:0
@@ -804,12 +876,12 @@
 #: code:addons/account/account_invoice.py:1361
 #, python-format
 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
-msgstr ""
+msgstr "Račun djelomično plaćen : %s%s od %s%s (%s%s preostaje)"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "Ispiši fakturu"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:111
@@ -818,11 +890,21 @@
 "Cannot %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only refund this invoice."
 msgstr ""
-
-#. module: account
+"Nije moguće %s fakturu koja je već zatvorena, račun bi prvo trebao biti "
+"ponovo otvoren. Jedino možete napraviti povrat po ovoj fakturi."
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.account:0
+msgid "Account code"
+msgstr "Šifra konta"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
-msgstr ""
+msgstr "Hijerahijski prikaz podređenih"
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -840,17 +922,17 @@
 #: model:ir.model,name:account.model_project_account_analytic_line
 #, python-format
 msgid "Analytic Entries by line"
-msgstr ""
+msgstr "Analitički zapisi po stavkama"
 
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr ""
+msgstr "Način povrata"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
-msgstr ""
+msgstr "Financijski izvještaj"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -876,6 +958,8 @@
 "Taxes are missing!\n"
 "Click on compute button."
 msgstr ""
+"Nedostaju porezi!\n"
+"Kliknite na dugme Izračunaj"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -890,13 +974,13 @@
 #. module: account
 #: view:account.invoice.report:0
 msgid "Supplier Invoices And Refunds"
-msgstr ""
+msgstr "Fakture dobavljača i povrati"
 
 #. module: account
 #: code:addons/account/account_move_line.py:851
 #, python-format
 msgid "Entry is already reconciled."
-msgstr ""
+msgstr "Unos je već zatvoren."
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -908,12 +992,12 @@
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
-msgstr ""
+msgstr "Analitički dnevnik konta"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Send by Email"
-msgstr ""
+msgstr "Pošalji e-mailom"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -924,16 +1008,18 @@
 "Print Report with the currency column if the currency differs from the "
 "company currency."
 msgstr ""
+"Ispiši izvještaj sa kolonom valute, ako je valuta različita od valute "
+"kompanije."
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "J.C./Move name"
-msgstr ""
+msgstr "Naziv kretanja dnevničkog zapisa"
 
 #. module: account
 #: view:account.account:0
 msgid "Account Code and Name"
-msgstr ""
+msgstr "Šifra i naziv konta"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -942,9 +1028,19 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "September"
-msgstr ""
-
-#. module: account
+msgstr "Septembar"
+
+#. module: account
+<<<<<<< TREE
+=======
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
+#, python-format
+msgid "Latest Manual Reconciliation Processed:"
+msgstr "Zadnje ručno zatvaranje odrađeno:"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.subscription,period_type:0
 msgid "days"
 msgstr "Dani"
@@ -953,7 +1049,7 @@
 #: help:account.account.template,nocreate:0
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
-msgstr ""
+msgstr "Ako je označeno, novi kontni plan zadano neće sadržavati."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_manual_reconcile
@@ -963,6 +1059,10 @@
 "                </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                    Nisu nađene stavke dnevnika.\n"
+"                </p>\n"
+"            "
 
 #. module: account
 #: code:addons/account/account.py:1677
@@ -972,6 +1072,8 @@
 "                                                  opening/closing fiscal "
 "year process."
 msgstr ""
+"Nije moguće ponovo otvoriti stavke ako su one generisane u procesu "
+"otvaranja/zatvaranja poslovne godine."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_new
@@ -987,7 +1089,7 @@
 #. module: account
 #: field:account.journal.cashbox.line,pieces:0
 msgid "Values"
-msgstr ""
+msgstr "Vrijednosti"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
@@ -1009,18 +1111,18 @@
 #. module: account
 #: field:account.config.settings,purchase_journal_id:0
 msgid "Purchase journal"
-msgstr ""
+msgstr "Dnevnici nabavke"
 
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_paid
 msgid "Invoice paid"
-msgstr ""
+msgstr "Faktura plaćena"
 
 #. module: account
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Approve"
-msgstr ""
+msgstr "Odobri"
 
 #. module: account
 #: view:account.invoice:0
@@ -1032,7 +1134,7 @@
 #. module: account
 #: help:account.invoice,supplier_invoice_number:0
 msgid "The reference of this invoice as provided by the supplier."
-msgstr ""
+msgstr "Referenca ove fakture dobijena je od dobavljača"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1052,27 +1154,27 @@
 #: code:addons/account/account_invoice.py:899
 #, python-format
 msgid "Please define sequence on the journal related to this invoice."
-msgstr ""
+msgstr "Molimo definišite sekvencu dnevnika povezanog sa ovom fakturom."
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Napredni filteri..."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
 msgid "Centralizing Journal"
-msgstr ""
+msgstr "Centralizirani dnevnik"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr ""
+msgstr "Povrat prodaje"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr ""
+msgstr "Izvod banke"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
@@ -1085,12 +1187,12 @@
 "If the Tax account is a tax code account, this field will contain the taxed "
 "amount.If the tax account is base tax code, this field will contain the "
 "basic amount(without tax)."
-msgstr ""
+msgstr "Porez ili osnovica poreza ovisno o poreznoj grupi."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr ""
+msgstr "Nabavke"
 
 #. module: account
 #: field:account.model,lines_id:0
@@ -1117,7 +1219,7 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Mogućnosti"
 
 #. module: account
 #: code:addons/account/account.py:2346
@@ -1127,7 +1229,7 @@
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "Nema analitičkog dnevnika !"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1153,16 +1255,32 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                                                          Kliknite za "
+"dodavanje konta\n"
+"                                                      </p><p>\n"
+"                                                           Kada se koriste "
+"transakcije sa više valuta, možete dobiti ili izgubiti\n"
+"                                                           određeni iznos "
+"zbog kursnih razlika. Ovaj meni pruža Vam\n"
+"                                                           predviđanje "
+"dobiti i gubitka ostvarenog ukoliko bi se te\n"
+"                                                           transakcije "
+"završile danas. Samo za konta koji imaju postavljenu \n"
+"                                                           sekundarnu "
+"valutu.\n"
+"                                                        </p>\n"
+"            "
 
 #. module: account
 #: field:account.bank.accounts.wizard,acc_name:0
 msgid "Account Name."
-msgstr ""
+msgstr "Naziv konta"
 
 #. module: account
 #: field:account.journal,with_last_closing_balance:0
 msgid "Opening With Last Closing Balance"
-msgstr ""
+msgstr "Otvaranje sa saldom zadnjeg zatvaranja"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -1170,6 +1288,8 @@
 "Check this box if you don't want any tax related to this tax code to appear "
 "on invoices"
 msgstr ""
+"Označite ovdje ukoliko ne želite da se porezi povezani sa ovom šifrom poreza "
+"pojavljuju na fakturama."
 
 #. module: account
 #: field:report.account.receivable,name:0
@@ -1184,7 +1304,7 @@
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "Odaberite poslovnu godinu koju treba zatvoriti"
 
 #. module: account
 #: help:account.account.template,user_type:0
@@ -1192,22 +1312,30 @@
 "These types are defined according to your country. The type contains more "
 "information about the account and its specificities."
 msgstr ""
+"Ovi su tipovi definirani prema vašoj zemlji. Tip sadržava više informacija o "
+"kontu i njegovim specifičnostima."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Refund "
-msgstr ""
+msgstr "Povrat "
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_analytic_line.py:90
 #, python-format
 msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+=======
+#: help:account.config.settings,company_footer:0
+msgid "Bank accounts as printed in the footer of each printed document"
+msgstr "Bankovni računi, kako se vide na ispisu u podnožju dokumenta"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "Opcije primjenjivosti"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1219,12 +1347,12 @@
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr ""
+msgstr "Kase"
 
 #. module: account
 #: field:account.config.settings,sale_refund_journal_id:0
 msgid "Sale refund journal"
-msgstr ""
+msgstr "Dnevnik povrata u prodaji"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -1243,6 +1371,18 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Pritisnite za kreiranje novog unosa u blagajnu.\n"
+"              </p><p>\n"
+"                Pomoću blagajne moguće je na jednostavan način upravljati "
+"dnevnicima\n"
+"                blagajne. Na jednostavan način možete pratiti uplate "
+"gotovine\n"
+"                na dnevnoj bazi. Moguće je evidentirati novac u blagajni, a "
+"zatim\n"
+"                pratiti sve ulaze i izlaze novca iz nje.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_bank
@@ -1250,7 +1390,7 @@
 #: code:addons/account/account.py:3092
 #, python-format
 msgid "Bank"
-msgstr ""
+msgstr "Banka"
 
 #. module: account
 #: field:account.period,date_start:0
@@ -1260,12 +1400,12 @@
 #. module: account
 #: view:account.tax:0
 msgid "Refunds"
-msgstr ""
+msgstr "Povrati"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr ""
+msgstr "Potvrdi izvod"
 
 #. module: account
 #: view:account.tax:0
@@ -1278,6 +1418,8 @@
 "Total amount (in Secondary currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Ukupni iznos (u drugoj valuti) za transakcije koje se vode u sekundarnoj "
+"valuti za ovaj konto."
 
 #. module: account
 #: field:account.fiscal.position.tax,tax_dest_id:0
@@ -1306,17 +1448,17 @@
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr ""
+msgstr "Otkaži fakture"
 
 #. module: account
 #: help:account.journal,code:0
 msgid "The code will be displayed on reports."
-msgstr ""
+msgstr "Šifra će biti prikazana na izvještajima."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
-msgstr ""
+msgstr "Porezi koji se koriste u nabavkama"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1336,7 +1478,7 @@
 #: view:account.analytic.account:0
 #: field:account.config.settings,chart_template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Predložak"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1376,7 +1518,7 @@
 #. module: account
 #: view:account.subscription:0
 msgid "Draft Subscription"
-msgstr ""
+msgstr "Pretplate u pripremi"
 
 #. module: account
 #: view:account.account:0
@@ -1409,26 +1551,26 @@
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+msgstr "Uključeno u iznos osnovice"
 
 #. module: account
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr ""
+msgstr "Analiza unosa"
 
 #. module: account
 #: field:account.account,level:0
 #: field:account.financial.report,level:0
 msgid "Level"
-msgstr ""
+msgstr "Nivo"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
 #, python-format
 msgid "You can only change currency for Draft Invoice."
-msgstr ""
+msgstr "Valutu možete mijenjati jedino u fakturama u pripremi."
 
 #. module: account
 #: report:account.invoice:0
@@ -1448,13 +1590,13 @@
 #: code:addons/account/wizard/account_financial_report.py:70
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "Odaberite početni i završni period"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
 #: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
-msgstr ""
+msgstr "Dobit i Gubitak"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1464,7 +1606,7 @@
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr ""
+msgstr "Traži predložak poreza"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -1483,12 +1625,12 @@
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr ""
+msgstr "Početni saldo"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Vrati u pripremu"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -1499,22 +1641,22 @@
 #. module: account
 #: field:account.fiscalyear.close.state,fy_id:0
 msgid "Fiscal Year to Close"
-msgstr ""
+msgstr "Zatvaranje poslovne godine"
 
 #. module: account
 #: field:account.config.settings,sale_sequence_prefix:0
 msgid "Invoice sequence"
-msgstr ""
+msgstr "Sekvence faktura"
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "Analiza stavki dnevnika"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
-msgstr ""
+msgstr "Partneri"
 
 #. module: account
 #: help:account.bank.statement,state:0
@@ -1523,13 +1665,25 @@
 "And after getting confirmation from the bank it will be in 'Confirmed' "
 "status."
 msgstr ""
+"Kada je novi izvod kreiran status je 'U pripremi'.\n"
+"Nakon dobivanja potvrde od banke biti će u 'Potvrđeno' statusu."
 
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice Status"
-msgstr ""
-
-#. module: account
+msgstr "Status fakture"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.open.closed.fiscalyear:0
+#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
+msgid "Cancel Closing Entries"
+msgstr "Otkaži stavke zatvaranja"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.bank.statement:0
 #: model:ir.model,name:account.model_account_bank_statement
 #: model:process.node,name:account.process_node_accountingstatemententries0
@@ -1549,7 +1703,7 @@
 #: code:addons/account/account.py:768
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopija)"
 
 #. module: account
 #: report:account.account.balance:0
@@ -1568,11 +1722,13 @@
 "There is no default debit account defined \n"
 "on journal \"%s\"."
 msgstr ""
+"Nije definisan zadani dugovni konto \n"
+"za dnevnik \"%s\"."
 
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr ""
+msgstr "Pretraži poreze"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
@@ -1587,7 +1743,7 @@
 #. module: account
 #: field:account.entries.report,nbr:0
 msgid "# of Items"
-msgstr ""
+msgstr "# stavki"
 
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
@@ -1602,6 +1758,9 @@
 "There is nothing to reconcile. All invoices and payments\n"
 "                    have been reconciled, your partner balance is clean."
 msgstr ""
+"Nema  stavaka za zatvaranje. Sve fakture i plaćanja \n"
+"                                     su već zatvoreni, saldo vašeg partnera "
+"je uredan."
 
 #. module: account
 #: field:account.chart.template,code_digits:0
@@ -1613,14 +1772,14 @@
 #. module: account
 #: field:account.journal,entry_posted:0
 msgid "Skip 'Draft' State for Manual Entries"
-msgstr ""
+msgstr "Preskoči stanje 'U pripremi' za ručni upis"
 
 #. module: account
 #: code:addons/account/report/common_report_header.py:92
 #: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
-msgstr ""
+msgstr "Nije implementirano."
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1630,17 +1789,17 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "eFakture i Plaćanja"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for Period"
-msgstr ""
+msgstr "Knjiga troškova za period"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Entries "
-msgstr ""
+msgstr "# stavaka "
 
 #. module: account
 #: help:account.fiscal.position,active:0
@@ -1648,11 +1807,13 @@
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
 msgstr ""
+"Isključivanjem polja aktivno, možete sakriti fiskalnu poziciju bez da je "
+"brišete."
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
 msgid "A Temporary table used for Dashboard view"
-msgstr ""
+msgstr "Privremena tablica za kontrolnu ploču"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
@@ -1669,7 +1830,7 @@
 #. module: account
 #: field:account.config.settings,company_footer:0
 msgid "Bank accounts footer preview"
-msgstr ""
+msgstr "Pregled podnožja sa podacima od banke"
 
 #. module: account
 #: selection:account.account,type:0
@@ -1685,7 +1846,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "Ponavljajuće stavke"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
@@ -1695,7 +1856,7 @@
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
-msgstr ""
+msgstr "Ponavljanje"
 
 #. module: account
 #: field:account.journal,groups_id:0
@@ -1710,17 +1871,17 @@
 #. module: account
 #: view:account.journal:0
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Napredna podešavanja"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr ""
+msgstr "Traži izvode banke"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr ""
+msgstr "Nepotvrđene stavke knjiženja"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1737,7 +1898,7 @@
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
 msgid "ir.sequence"
-msgstr ""
+msgstr "ir.sequence"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1748,7 +1909,7 @@
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Datum/Šifra"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
@@ -1795,23 +1956,23 @@
 #. module: account
 #: field:account.move,balance:0
 msgid "balance"
-msgstr ""
+msgstr "saldo"
 
 #. module: account
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "Analitički troškovi za fakturisanje"
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr ""
+msgstr "Sekvenca poslovne godine"
 
 #. module: account
 #: field:account.config.settings,group_analytic_accounting:0
 msgid "Analytic accounting"
-msgstr ""
+msgstr "Analitičko računovodstvo"
 
 #. module: account
 #: report:account.overdue:0
@@ -1830,29 +1991,37 @@
 "should choose 'Round per line' because you certainly want the sum of your "
 "tax-included line subtotals to be equal to the total amount with taxes."
 msgstr ""
+"Ako izaberete \"zaokruživanje po stavci\": za svaki porez, iznos poreza će "
+"prvo biti izračunat i zaokružen po svakoj stavci narudžbe/fakture, a tada će "
+"ti iznosi biti zbrajani do ukupnog iznosa poreza. Ukoliko odaberete "
+"\"Zaokurži globalno\" : za svaki porez iznos poreza će biti izračunat za "
+"svaku stavku narudžbe/fakture, tada će iznosi biti zbrojeni i eventualno taj "
+"zbroj će biti zaokružen. Ukoliko vršite prodaju sa uključenim porezima, "
+"trebali bi odabrati \"Zaokruži po stavci\" jer svakako želite da suma iznosa "
+"sa uključenim porezom bude ista kao i suma ukupnog iznosa sa porezom."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 #: view:report.account_type.sales:0
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "Prodaja po tipu konta"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_15days
 #: model:account.payment.term,note:account.account_payment_term_15days
 msgid "15 Days"
-msgstr ""
+msgstr "15 dana"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturisanje"
 
 #. module: account
 #: code:addons/account/report/account_partner_balance.py:115
 #, python-format
 msgid "Unknown Partner"
-msgstr ""
+msgstr "Nepoznat partner"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:103
@@ -1861,12 +2030,14 @@
 "The journal must have centralized counterpart without the Skipping draft "
 "state option checked."
 msgstr ""
+"Dnevnik mora imati jedinstvenu protustavku bez označene opcije preskoči U "
+"pripremi."
 
 #. module: account
 #: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Some entries are already reconciled."
-msgstr ""
+msgstr "Neke stavke su već zatvorene."
 
 #. module: account
 #: field:account.tax.code,sum:0
@@ -1876,7 +2047,7 @@
 #. module: account
 #: view:account.change.currency:0
 msgid "This wizard will change the currency of the invoice"
-msgstr ""
+msgstr "Ovaj čarobnjak će promjeniti valute fakture"
 
 #. module: account
 #: view:account.installer:0
@@ -1884,11 +2055,14 @@
 "Select a configuration package to setup automatically your\n"
 "                        taxes and chart of accounts."
 msgstr ""
+"Odaberite paket postavki za automatsko postavljanje vaših\n"
+"                                                               poreza i "
+"kontnog plana."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr ""
+msgstr "Konta na čekanju"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
@@ -1907,11 +2081,12 @@
 "If the active field is set to False, it will allow you to hide the journal "
 "period without removing it."
 msgstr ""
+"Period dnevnika možete sakriti umjesto brisanja ako isključite polje aktivan."
 
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort by"
-msgstr ""
+msgstr "Sortiraj po"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
@@ -1921,28 +2096,28 @@
 #. module: account
 #: field:account.config.settings,module_account_payment:0
 msgid "Manage payment orders"
-msgstr ""
+msgstr "Upravljanje nalozima za plaćanje"
 
 #. module: account
 #: view:account.period:0
 msgid "Duration"
-msgstr ""
+msgstr "Trajanje"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,last_closing_balance:0
 msgid "Last Closing Balance"
-msgstr ""
+msgstr "Zadnji saldo zatvaranja"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
 msgid "Account Common Journal Report"
-msgstr ""
+msgstr "Izvještaj zajedničkog dnevnika konta"
 
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "Svi partneri"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -1964,7 +2139,7 @@
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the tax declaration."
-msgstr ""
+msgstr "Koristi ovu šifru za poreski izvještaj."
 
 #. module: account
 #: help:account.period,special:0
@@ -1979,12 +2154,12 @@
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_validated
 msgid "Invoice validated"
-msgstr ""
+msgstr "Faktura odobrena"
 
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
-msgstr ""
+msgstr "Platite dobavljačima čekom"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -1995,7 +2170,7 @@
 #: field:account.bank.statement,message_ids:0
 #: field:account.invoice,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Poruke"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2007,6 +2182,11 @@
 "useful because it enables you to preview at any time the tax that you owe at "
 "the start and end of the month or quarter."
 msgstr ""
+"Ovaj meni prikazuje poreskii izvještaj baziran na ulaznim i izlaznim "
+"fakturama i plaćanjima. Odaberite jedan ili više perioda fiskalne godine. "
+"Potrebni podaci za poresku prijavu automatski se generiraju u OpenERP-u iz "
+"faktura. Podaci se osvježavaju u realnom vremenu. Ovo je veoma korisno jer "
+"Vam omogućava pregled stanja poreskog duga u trenutku pregleda."
 
 #. module: account
 #: code:addons/account/account.py:409
@@ -2062,7 +2242,7 @@
 #: code:addons/account/wizard/pos_box.py:35
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Greška!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -2077,28 +2257,37 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite za unos nove fakture dobavljača .\n"
+"              </p><p>\n"
+"                Možete kontrolisati fakturu vašeg dobavljača prema tome\n"
+"                šta ste kupili ili primili. OpenERP može također generisati\n"
+"                fakture u pripremi automatski iz narudžbi nabavke ili "
+"prijema.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Pogrešna dugovna ili potražna vrijednost upisane stavke!"
 
 #. module: account
 #: view:account.invoice.report:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 msgid "Invoices Analysis"
-msgstr ""
+msgstr "Analiza faktura"
 
 #. module: account
 #: model:ir.model,name:account.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Čarobnjak sastavljanja email-a"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "zatvori period"
 
 #. module: account
 #: code:addons/account/account.py:1058
@@ -2107,16 +2296,18 @@
 "This journal already contains items for this period, therefore you cannot "
 "modify its company field."
 msgstr ""
+"Ovaj dnevnik već sadrži stavke za ovaj period, stoga ne možete mijenjati "
+"njegovo polje kompanije."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "Unosi po stavkama"
 
 #. module: account
 #: field:account.vat.declaration,based_on:0
 msgid "Based on"
-msgstr ""
+msgstr "Bazirano na"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -2135,23 +2326,35 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Pritisnite za kreiranje novog bankovnog izvoda.\n"
+"              </p><p>\n"
+"                Bankovni izvod sadrži pregled svih financijskih transakcija\n"
+"                koje su nastale u danom razdoblju po bankovnom računu. "
+"Bankovne \n"
+"                izvode šalje banka periodično.\n"
+"              </p><p>\n"
+"                OpenERP dozvoljava direktno zatvaranje stavaka sa povezanim\n"
+"                ulaznim ili izlaznim fakturama.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.config.settings,currency_id:0
 msgid "Default company currency"
-msgstr ""
+msgstr "Zadana valuta kompanije"
 
 #. module: account
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 #: field:account.move.line,move_id:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Dnevnički zapis"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
-msgstr ""
+msgstr "Neplaćeno"
 
 #. module: account
 #: view:account.treasury.report:0
@@ -2159,12 +2362,12 @@
 #: model:ir.model,name:account.model_account_treasury_report
 #: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "Analiza blagajne"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr ""
+msgstr "Dnevnik Prodaje/Nabavke"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2176,7 +2379,7 @@
 #: code:addons/account/account_bank_statement.py:406
 #, python-format
 msgid "Please verify that an account is defined in the journal."
-msgstr ""
+msgstr "Molimo provjerite da je konto definisan u dnevniku"
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
@@ -2187,18 +2390,18 @@
 #: field:account.bank.statement,message_follower_ids:0
 #: field:account.invoice,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Pratioci"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr ""
+msgstr "Ispis dnevnika"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Kategorija proizvoda"
 
 #. module: account
 #: code:addons/account/account.py:656
@@ -2207,28 +2410,30 @@
 "You cannot change the type of account to '%s' type as it contains journal "
 "items!"
 msgstr ""
+"Nije moguće promijeniti tip konta na '%s' jer već sadrži stavke dnevnika!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr ""
+msgstr "Bruto bilanca"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscal Year"
-msgstr ""
+msgstr "Zatvaranje fiskalne godine"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
 #, python-format
 msgid "Journal :"
-msgstr ""
+msgstr "Dnevnik :"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
 msgid "A tax fiscal position could be defined only once time on same taxes."
 msgstr ""
+"Fiskalna pozicija poreza se može definisati samo jednom za jedan porez."
 
 #. module: account
 #: view:account.tax:0
@@ -2240,31 +2445,31 @@
 #: view:account.config.settings:0
 #: model:ir.actions.act_window,name:account.action_account_config
 msgid "Configure Accounting"
-msgstr ""
+msgstr "Postavke računovodstva"
 
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Referentna JM"
 
 #. module: account
 #: help:account.journal,allow_date:0
 msgid ""
 "If set to True then do not accept the entry if the entry date is not into "
 "the period dates"
-msgstr ""
+msgstr "Ne dozvoljava knjiženja izvan fiskalnog perioda"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
 #, python-format
 msgid "Good job!"
-msgstr ""
+msgstr "Dobro odrađen posao!"
 
 #. module: account
 #: field:account.config.settings,module_account_asset:0
 msgid "Assets management"
-msgstr ""
+msgstr "Upravljanje imovinom"
 
 #. module: account
 #: view:account.account:0
@@ -2287,6 +2492,9 @@
 "currency. You should remove the secondary currency on the account or select "
 "a multi-currency view on the journal."
 msgstr ""
+"Odabrani konto vašeg dnevničkog zapisa traži sekundarnu valutu. Trebali bi "
+"ste ukloniti sekundarnu valutu sa konta ili odabrati multivalutni pogled na "
+"dnevniku."
 
 #. module: account
 #: view:account.invoice:0
@@ -2299,17 +2507,17 @@
 msgid ""
 "If the active field is set to False, it will allow you to hide the tax "
 "without removing it."
-msgstr ""
+msgstr "Neaktivni porezi će biti skriveni u listama odabira."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr ""
+msgstr "Stavke analitičkog dnevnika povezane sa dnevnikom prodaje."
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Italic Text (smaller)"
-msgstr ""
+msgstr "Italic tekst ( manji)"
 
 #. module: account
 #: help:account.journal,cash_control:0
@@ -2317,6 +2525,7 @@
 "If you want the journal should be control at opening/closing, check this "
 "option"
 msgstr ""
+"Ako želite kontrolisati otvaranje i zatvaranje dnevnika, označite ovdje"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -2346,7 +2555,7 @@
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
 #, python-format
 msgid "Standard Encoding"
-msgstr ""
+msgstr "Standardno kodiranje"
 
 #. module: account
 #: view:account.journal.select:0
@@ -2357,22 +2566,22 @@
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_next:0
 msgid "Next supplier credit note number"
-msgstr ""
+msgstr "Sljedeći broj odobrenja dobavljaču"
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr ""
+msgstr "Konta za zatvaranje"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
 msgid "Import of the statement in the system from an electronic file"
-msgstr ""
+msgstr "Uvoz izvoda iz datoteke"
 
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr ""
+msgstr "Uvezi iz faktura"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2381,34 +2590,34 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "Ova F. godina"
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr ""
+msgstr "Stablo poreza"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_net
 #: model:account.payment.term,note:account.account_payment_term_net
 msgid "30 Net Days"
-msgstr ""
+msgstr "30 Neto dana"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:256
 #, python-format
 msgid "You do not have rights to open this %s journal !"
-msgstr ""
+msgstr "Nemate ovlaštenja da otvorite %s dnevnik!"
 
 #. module: account
 #: model:res.groups,name:account.group_supplier_inv_check_total
 msgid "Check Total on supplier invoices"
-msgstr ""
+msgstr "Provjeri ukupni iznos na fakturama dobavljača"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -2428,16 +2637,20 @@
 "partners accounts (for debit/credit computations), closed for depreciated "
 "accounts."
 msgstr ""
+"Ovaj tip se koristi za razlikovanje tipova s posebnim efektima u OpenERPu: "
+"pogled ne može imati zapise, konsolidacija su konta koja imaju podređena "
+"konta za konsolidaciju više kompanija, obveze/potraživanja su za saldakonti "
+"(za duguje/potražuje izračune), zatvoreni za konta koja se više ne koriste."
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
-msgstr ""
+msgstr "Pretraži predloške kontnog plana"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "Šifra kupca"
 
 #. module: account
 #: view:account.account.type:0
@@ -2478,7 +2691,7 @@
 #. module: account
 #: help:account.config.settings,default_sale_tax:0
 msgid "This sale tax will be assigned by default on new products."
-msgstr ""
+msgstr "Ovaj porez prodaje će biti primjenjen na svim novim proizvodima."
 
 #. module: account
 #: report:account.general.ledger_landscape:0
@@ -2490,17 +2703,17 @@
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "Promjeni u"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "# of Products Qty "
-msgstr ""
+msgstr "# kol. proizvoda "
 
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Prijedlog proizvoda"
 
 #. module: account
 #: report:account.account.balance:0
@@ -2568,16 +2781,18 @@
 "You cannot change the type of account from 'Closed' to any other type as it "
 "contains journal items!"
 msgstr ""
+"Ne možete mijenjati tip konta iz 'zatvoren' u neki drugi tip jer sadrži "
+"stavke dnevnika!"
 
 #. module: account
 #: field:account.invoice.report,account_line_id:0
 msgid "Account Line"
-msgstr ""
+msgstr "Stavka"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account Based on this Template"
-msgstr ""
+msgstr "Kreiraj  konto prema ovom predlošku"
 
 #. module: account
 #: code:addons/account/account_invoice.py:933
@@ -2588,6 +2803,10 @@
 "amount greater than the total invoiced amount. In order to avoid rounding "
 "issues, the latest line of your payment term must be of type 'balance'."
 msgstr ""
+"Nije moguće izraditi fakturu.\n"
+"Povezani način plaćanja je vjerojatno krivo postavljen i dalje izračunati "
+"iznos veći od iznosa ukupnog iznosa računa. Kako bi izbjegli probleme sa "
+"zaokruživanjem, zadnja linija vašeg plaćanja mora biti tipa 'saldo'."
 
 #. module: account
 #: view:account.move:0
@@ -2607,6 +2826,8 @@
 "In order to delete a bank statement, you must first cancel it to delete "
 "related journal items."
 msgstr ""
+"Kako bi izbrisali bankovni izvod, morate ga prvo otkazati kako bi se "
+"obrisale sve stavke dnevnika povezane s njim."
 
 #. module: account
 #: field:account.invoice.report,payment_term:0
@@ -2628,7 +2849,7 @@
 #: code:addons/account/account_move_line.py:579
 #, python-format
 msgid "You cannot create journal items on a closed account %s %s."
-msgstr ""
+msgstr "Nije moguće knjiženje stavaka na zatvorenom kontu %s %s."
 
 #. module: account
 #: field:account.period.close,sure:0
@@ -2644,27 +2865,27 @@
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr ""
+msgstr "Stanje računa 'U pripremi'"
 
 #. module: account
 #: view:product.category:0
 msgid "Account Properties"
-msgstr ""
+msgstr "Svojstva konta"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft refund"
-msgstr ""
+msgstr "Kreiraj povrat u pripremi"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr ""
+msgstr "Zatvaranje salda konti"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin. Account"
-msgstr ""
+msgstr "Fin. konto"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2676,7 +2897,7 @@
 #: model:account.payment.term,name:account.account_payment_term_advance
 #: model:account.payment.term,note:account.account_payment_term_advance
 msgid "30% Advance End 30 Days"
-msgstr ""
+msgstr "30% avans, ostatak kroz 30 dana"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2692,7 +2913,7 @@
 #. module: account
 #: help:account.invoice.tax,sequence:0
 msgid "Gives the sequence order when displaying a list of invoice tax."
-msgstr ""
+msgstr "Određuje redosljed sekvenci kada prikazuje listu poreza fakture."
 
 #. module: account
 #: field:account.tax,base_sign:0
@@ -2711,7 +2932,7 @@
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr ""
+msgstr "Potvrdite fakture u pripremi"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2720,12 +2941,12 @@
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dan"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr ""
+msgstr "Konta za obnovu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
@@ -2749,6 +2970,7 @@
 msgstr "Detalji banke"
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.actions.act_window,help:account.action_move_journal_line
 msgid ""
 "<p class=\"oe_view_nocontent_create\">\n"
@@ -2767,6 +2989,11 @@
 "              </p>\n"
 "            "
 msgstr ""
+=======
+#: view:account.bank.statement:0
+msgid "Cancel CashBox"
+msgstr "Otkaži kasu"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: help:account.invoice,payment_term:0
@@ -2785,7 +3012,7 @@
 #. module: account
 #: field:account.config.settings,purchase_sequence_next:0
 msgid "Next supplier invoice number"
-msgstr ""
+msgstr "Sljedeći broj fakture dobavljača"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -2795,7 +3022,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr ""
+msgstr "Izvodi"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2805,7 +3032,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_writeoff
 msgid "Account move line reconcile (writeoff)"
-msgstr ""
+msgstr "Zatvaranje stavke glavne knjige (otpis)"
 
 #. module: account
 #: model:account.account.type,name:account.conf_account_type_tax
@@ -2834,7 +3061,7 @@
 #: field:account.config.settings,default_purchase_tax:0
 #: field:account.config.settings,purchase_tax:0
 msgid "Default purchase tax"
-msgstr ""
+msgstr "Zadani porez nabave"
 
 #. module: account
 #: view:account.account:0
@@ -2847,7 +3074,7 @@
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr ""
+msgstr "Konta"
 
 #. module: account
 #: code:addons/account/account.py:3541
@@ -2860,19 +3087,19 @@
 #: code:addons/account/account_move_line.py:536
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Greška u konfiguraciji!"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:434
 #, python-format
 msgid "Statement %s confirmed, journal items were created."
-msgstr ""
+msgstr "Izvod %s potvrđen, stavke dnevnika su kreirane."
 
 #. module: account
 #: field:account.invoice.report,price_average:0
 #: field:account.invoice.report,user_currency_price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Prosječna Cijena"
 
 #. module: account
 #: report:account.overdue:0
@@ -2883,12 +3110,12 @@
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Label"
-msgstr ""
+msgstr "Naljepnica"
 
 #. module: account
 #: view:res.partner.bank:0
 msgid "Accounting Information"
-msgstr ""
+msgstr "Računovodstvene informacije"
 
 #. module: account
 #: view:account.tax:0
@@ -2919,28 +3146,29 @@
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Purchase Tax"
-msgstr ""
+msgstr "Porez Nabave"
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
 msgid "The Account can either be a base tax code or a tax code account."
-msgstr ""
+msgstr "Odaberite ili poreznu grupu poreza ili poreznu grupu osnovice."
 
 #. module: account
 #: sql_constraint:account.model.line:0
 msgid "Wrong credit or debit value in model, they must be positive!"
 msgstr ""
+"Kriva dugovna ili potražna vrijednost u modelu. Moraju biti pozitivne!"
 
 #. module: account
 #: model:process.node,note:account.process_node_reconciliation0
 #: model:process.node,note:account.process_node_supplierreconciliation0
 msgid "Comparison between accounting and payment entries"
-msgstr ""
+msgstr "Usporedba stavki knjiženja i plaćanja"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr ""
+msgstr "Automatsko zatvaranje"
 
 #. module: account
 #: field:account.invoice,reconciled:0
@@ -2957,7 +3185,7 @@
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Bank Statements"
-msgstr ""
+msgstr "Izvodi banke"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
@@ -2978,6 +3206,17 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite za otvaranje nove fiskalne godine.\n"
+"              </p><p>\n"
+"                Definišite fiskalnu godinu vaše kompanije prema vašim "
+"potrebama. \n"
+"                Fiskalna godina je period na kraju kojeg zaključujemo "
+"poslovnu\n"
+"                godinu (obično 12 mjeseci). U Bosni fiskalna godina prati "
+"kalendarsku.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: view:account.common.report:0
@@ -2985,12 +3224,12 @@
 #: view:account.move.line:0
 #: view:accounting.report:0
 msgid "Dates"
-msgstr ""
+msgstr "Datumi"
 
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr ""
+msgstr "Nadređeni prijedlog kontnog plana"
 
 #. module: account
 #: field:account.tax,parent_id:0
@@ -3009,12 +3248,12 @@
 #: model:process.transition,name:account.process_transition_entriesreconcile0
 #: model:process.transition,name:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries"
-msgstr ""
+msgstr "Knjigovodstveni unosi"
 
 #. module: account
 #: constraint:account.move.line:0
 msgid "Account and Period must belong to the same company."
-msgstr ""
+msgstr "Konto i period moraju pripadati istoj kompaniji."
 
 #. module: account
 #: field:account.invoice.line,discount:0
@@ -3030,6 +3269,10 @@
 "Note that journal entries that are automatically created by the system are "
 "always skipping that state."
 msgstr ""
+"Označite ovu kućicu ako ne želite da nove stavke dnevnika prolaze kroz "
+"status 'U pripremi' već da direktno postaju 'Knjižene' bez ručne ovjere. "
+"Imajte na umu da stavke dnevnika koje se kreiraju automatski uvjek preskaču "
+"taj status."
 
 #. module: account
 #: field:account.move.line.reconcile,writeoff:0
@@ -3040,7 +3283,7 @@
 #: field:account.bank.statement,message_unread:0
 #: field:account.invoice,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Nepročitane poruke"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -3049,35 +3292,39 @@
 "Selected invoice(s) cannot be confirmed as they are not in 'Draft' or 'Pro-"
 "Forma' state."
 msgstr ""
+"Odabrani fakture ne mogu biti potvrđeni jer nisu u stanju 'U pripremi' ili "
+"'ProForma'"
 
 #. module: account
 #: code:addons/account/account.py:1071
 #, python-format
 msgid "You should choose the periods that belong to the same company."
-msgstr ""
+msgstr "Trebali bi odabrati periode koji pripadaju istoj kompaniji."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_report_account_sales_tree_all
 #: view:report.account.sales:0
 #: view:report.account_type.sales:0
 msgid "Sales by Account"
-msgstr ""
+msgstr "Prodaje po kontu"
 
 #. module: account
 #: code:addons/account/account.py:1449
 #, python-format
 msgid "You cannot delete a posted journal entry \"%s\"."
-msgstr ""
+msgstr "Ne možete obrisati knjiženu stavku dnevnika\"%s\"."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Accounting Period"
 msgstr ""
+"Postavite zadani konto za stavke poreza na fakturama. Ostavite prazno za "
+"konto troškova."
 
 #. module: account
 #: field:account.config.settings,sale_journal_id:0
 msgid "Sale journal"
-msgstr ""
+msgstr "Dnevnik prodaje"
 
 #. module: account
 #: code:addons/account/account.py:2346
@@ -3085,7 +3332,7 @@
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "You have to define an analytic journal on the '%s' journal!"
-msgstr ""
+msgstr "Morate definisati analitički dnevnik na dnevniku '%s' !"
 
 #. module: account
 #: code:addons/account/account.py:781
@@ -3094,6 +3341,8 @@
 "This journal already contains items, therefore you cannot modify its company "
 "field."
 msgstr ""
+"Ovaj dnevnik već sadrži stavke i prema tome ne možete mijenjati polje "
+"kompanije"
 
 #. module: account
 #: code:addons/account/account.py:409
@@ -3102,6 +3351,8 @@
 "You need an Opening journal with centralisation checked to set the initial "
 "balance."
 msgstr ""
+"Treba Vam dnevnik početnog stanja sa upaljenom centralizacijom za "
+"postavljanje početnog stanja."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_tax_code_list
@@ -3112,13 +3363,13 @@
 #. module: account
 #: view:account.account:0
 msgid "Unrealized Gains and losses"
-msgstr ""
+msgstr "Nerealizirani dobici i i gubici"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
 #: model:ir.ui.menu,name:account.menu_finance_receivables
 msgid "Customers"
-msgstr ""
+msgstr "Kupci"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -3134,12 +3385,12 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr ""
+msgstr "Avgust"
 
 #. module: account
 #: field:accounting.report,debit_credit:0
 msgid "Display Debit/Credit Columns"
-msgstr ""
+msgstr "Prikaži kolone duguje/potražuje"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -3148,7 +3399,7 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktobar"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -3156,17 +3407,19 @@
 "The optional quantity expressed by this line, eg: number of product sold. "
 "The quantity is not a legal requirement but is very useful for some reports."
 msgstr ""
+"Opcionalna količina izražena ovom linijom, npr.: broj prodanih komada "
+"artikla. Količina je vrlo korisna za neke izvještaje."
 
 #. module: account
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile Transactions"
-msgstr ""
+msgstr "Transakcije koje nisu zatvorene"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
 msgid "Only One Chart Template Available"
-msgstr ""
+msgstr "Samo jedan prijedlog kontnog plana je dostupan"
 
 #. module: account
 #: view:account.chart.template:0
@@ -3179,7 +3432,7 @@
 #: field:account.bank.statement,message_summary:0
 #: field:account.invoice,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Rezime"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -3191,6 +3444,8 @@
 msgid ""
 "used in statement reconciliation domain, but shouldn't be used elswhere."
 msgstr ""
+"korišteno u domeni zatvaranja izvoda, ali ne bi se trebalo koristiti na "
+"drugim mjestima."
 
 #. module: account
 #: field:account.config.settings,date_stop:0
@@ -3205,7 +3460,7 @@
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr ""
+msgstr "Zadani porez prodaje"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -3214,6 +3469,8 @@
 "between the creation date or the creation date of the entries plus the "
 "partner payment terms."
 msgstr ""
+"Datum dospijeća generisanig stavaka za ovaj model. Možete birati između "
+"datuma izrade  ili datum izrade/unosa plus uslova plaćanja partnera."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_accounting
@@ -3223,7 +3480,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report_pl
 msgid "Profit And Loss"
-msgstr ""
+msgstr "Dobit i Gubitak"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -3246,6 +3503,8 @@
 "Tax base different!\n"
 "Click on compute to update the tax base."
 msgstr ""
+"Različita poreska osnovica!\n"
+"Kliknite za ponovni izračun osnovice."
 
 #. module: account
 #: field:account.partner.ledger,page_split:0
@@ -3264,13 +3523,13 @@
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr ""
+msgstr "Bilans"
 
 #. module: account
 #: code:addons/account/account.py:431
 #, python-format
 msgid "Unable to adapt the initial balance (negative value)."
-msgstr ""
+msgstr "Nije moguće postaviti početno stanje (negativne vrijednosti)."
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -3289,23 +3548,23 @@
 #: view:account.config.settings:0
 #: view:account.installer:0
 msgid "Date Range"
-msgstr ""
+msgstr "Raspon datuma"
 
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr ""
+msgstr "Pretraži period"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr ""
+msgstr "Valuta fakture"
 
 #. module: account
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
-msgstr ""
+msgstr "Računovodstveni izvještaj"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -3320,7 +3579,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr ""
+msgstr "Dnevnici Prodaje/Nabave"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -3341,7 +3600,7 @@
 #: code:addons/account/account.py:2678
 #, python-format
 msgid "There is no parent code for the template account."
-msgstr ""
+msgstr "Nema nadređene šifre za prijedlog konta."
 
 #. module: account
 #: help:account.chart.template,code_digits:0
@@ -3352,28 +3611,30 @@
 #. module: account
 #: field:res.partner,property_supplier_payment_term:0
 msgid "Supplier Payment Term"
-msgstr ""
+msgstr "Uslovi plaćanja dobavljača"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
-msgstr ""
+msgstr "Pretraži fiskalnu godinu"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Always"
-msgstr ""
+msgstr "Uvijek"
 
 #. module: account
 #: field:account.config.settings,module_account_accountant:0
 msgid ""
 "Full accounting features: journals, legal statements, chart of accounts, etc."
 msgstr ""
+"Puna računovodstvena funkcionalnost: dnevnici, zakonski izvještaji, kontni "
+"plan itd."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr ""
+msgstr "Ukupna količina"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
@@ -3415,7 +3676,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "Proforma fakture"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -3425,12 +3686,12 @@
 #. module: account
 #: field:account.move.line,reconcile:0
 msgid "Reconcile Ref"
-msgstr ""
+msgstr "Ref. zatvaranja"
 
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
-msgstr ""
+msgstr "Kompanija ima kontni plan"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
@@ -3440,7 +3701,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr ""
+msgstr "Saldo konti partnera"
 
 #. module: account
 #: model:email.template,body_html:account.email_template_edi_invoice
@@ -3530,14 +3791,14 @@
 #. module: account
 #: view:account.period:0
 msgid "Account Period"
-msgstr ""
+msgstr "Obračunski period"
 
 #. module: account
 #: help:account.account,currency_id:0
 #: help:account.account.template,currency_id:0
 #: help:account.bank.accounts.wizard,currency_id:0
 msgid "Forces all moves for this account to have this secondary currency."
-msgstr ""
+msgstr "Forsira da sva knjiženja ovog konta moraju imati sekundarnu valutu."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move_line
@@ -3545,6 +3806,8 @@
 "This wizard will validate all journal entries of a particular journal and "
 "period. Once journal entries are validated, you can not update them anymore."
 msgstr ""
+"Ovaj čarobnjak će knjižiti sve neknjižene stavke odabranog dnevnika za "
+"odabrani period."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
@@ -3555,12 +3818,12 @@
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transactions"
-msgstr ""
+msgstr "Transakcije"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
 msgid "Account Unreconcile Reconcile"
-msgstr ""
+msgstr "Zatvaranje neztvorenih konta"
 
 #. module: account
 #: help:account.account.type,close_method:0
@@ -3575,6 +3838,13 @@
 " 'Unreconciled' will copy only the journal items that were unreconciled on "
 "the first day of the new fiscal year."
 msgstr ""
+"Postavite metodu knjiženja kod zatvaranja konta na kraju godine.\n"
+"Sva konta ovog tipa će se zatvarati prema odabranoj metodi.\n"
+"\n"
+" 'Ništa' - neće generirati stavke.\n"
+" 'Saldo' - koristi se uglavnom za konta banke i blagajne.\n"
+" 'Stavke' - sve stavke se prenose u novu godinu(i zatvorene).\n"
+" 'Otvorene stavke' - prenose se otvorene stavke (konta kupaca i dobavljača)."
 
 #. module: account
 #: view:account.tax.template:0
@@ -3618,7 +3888,7 @@
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr ""
+msgstr "Preostali partneri"
 
 #. module: account
 #: view:account.subscription:0
@@ -3642,12 +3912,12 @@
 #: view:account.installer:0
 #: view:wizard.multi.charts.accounts:0
 msgid "Accounting Application Configuration"
-msgstr ""
+msgstr "Konfiguracija računovodstvene aplikacije"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 msgid "Account Tax Declaration"
-msgstr ""
+msgstr "Poreski izvještaj"
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -3656,6 +3926,8 @@
 "be with same name as statement name. This allows the statement entries to "
 "have the same references than the statement itself"
 msgstr ""
+"Ako date ime drugačije od /, njegove kreirane stavke će imati isto ime kao i "
+"izvod. Ovo omogućava stavkama izvoda da imaju istu oznaku kao i glava."
 
 #. module: account
 #: code:addons/account/account_invoice.py:1016
@@ -3665,6 +3937,9 @@
 "centralized counterpart box in the related journal from the configuration "
 "menu."
 msgstr ""
+"Ne možete kreirati račun na centraiziranom dnevniku. Odznačite "
+"centralizirana protustavka kvadratić u povezanom dnevniku iz menija "
+"konfiguracije."
 
 #. module: account
 #: field:account.bank.statement,balance_start:0
@@ -3676,7 +3951,7 @@
 #: code:addons/account/account_invoice.py:1465
 #, python-format
 msgid "No Partner Defined !"
-msgstr ""
+msgstr "Nije definiran partner !"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_close
@@ -3689,7 +3964,7 @@
 #: view:account.bank.statement:0
 #: field:account.cashbox.line,subtotal_opening:0
 msgid "Opening Subtotal"
-msgstr ""
+msgstr "Početni subtotal"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -3697,11 +3972,13 @@
 "You cannot create journal items with a secondary currency without recording "
 "both 'currency' and 'amount currency' field."
 msgstr ""
+"Ne možete kreirati stavke dnevnika sa sekundarnom valutom bez unosa polja "
+"'valuta' i 'iznos valute'."
 
 #. module: account
 #: field:account.financial.report,display_detail:0
 msgid "Display details"
-msgstr ""
+msgstr "Prikaži detalje"
 
 #. module: account
 #: report:account.overdue:0
@@ -3713,7 +3990,7 @@
 msgid ""
 "The amount expressed in the related account currency if not equal to the "
 "company one."
-msgstr ""
+msgstr "Iznos iskazan u valuti konta ako nije isti valuti kompanije."
 
 #. module: account
 #: help:account.config.settings,paypal_account:0
@@ -3723,6 +4000,9 @@
 "quotations with a button \"Pay with  Paypal\" in automated emails or through "
 "the OpenERP portal."
 msgstr ""
+"Paypal račun (email) za primanja online uplata. Ako postavite paypal račun, "
+"partner će moći platiti vaše račune ili ponude pomoću PayPal dugmeta u "
+"automatski poslanim mailovima sa OpenERP portala."
 
 #. module: account
 #: code:addons/account/account_move_line.py:536
@@ -3733,6 +4013,10 @@
 "You can create one in the menu: \n"
 "Configuration/Journals/Journals."
 msgstr ""
+"Nema niti jednog dnevnika %s tipa za ovu kompaniju.\n"
+"\n"
+"Možete kreirati jednog u meniju: \n"
+"Konfiguracija/Dnevnici/Dnevnici."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_unreconcile
@@ -3751,17 +4035,17 @@
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr ""
+msgstr "Stablo poreza"
 
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr ""
+msgstr "Pretraži dnevnik knjiženja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr ""
+msgstr "Faktura na čekanju"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -3783,6 +4067,11 @@
 "by\n"
 "                                    your supplier/customer."
 msgstr ""
+"Moći ćete uređivati i odobriti ovo\n"
+"                                    odobrenje direktno ili ostaviti u "
+"pripremi,\n"
+"                                    čekajući dokument koji će biti izdan\n"
+"                                    od strane dobavljača/kupca."
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -3790,6 +4079,8 @@
 "All selected journal entries will be validated and posted. It means you "
 "won't be able to modify their accounting fields anymore."
 msgstr ""
+"Sve odabrane stavke dnevnika će biti potvrđene i objavljene. To znači da "
+"nećete više moći modificirati njihova polja."
 
 #. module: account
 #: code:addons/account/account_move_line.py:98
@@ -3798,6 +4089,8 @@
 "You have not supplied enough arguments to compute the initial balance, "
 "please select a period and a journal in the context."
 msgstr ""
+"Niste osigurali dovoljno argumenata za izračun početnog stanja, molimo "
+"odaberite period i dnevnik u kontekstu."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -3807,7 +4100,7 @@
 #. module: account
 #: field:account.config.settings,expects_chart_of_accounts:0
 msgid "This company has its own chart of accounts"
-msgstr ""
+msgstr "Ova organizacija ima svoj kontni plan"
 
 #. module: account
 #: view:account.chart:0
@@ -3818,7 +4111,7 @@
 #: view:cash.box.out:0
 #: model:ir.actions.act_window,name:account.action_cash_box_out
 msgid "Take Money Out"
-msgstr ""
+msgstr "Podigni novac"
 
 #. module: account
 #: report:account.vat.declaration:0
@@ -3828,7 +4121,7 @@
 #. module: account
 #: view:account.move:0
 msgid "Search Move"
-msgstr ""
+msgstr "Pretraži kretanja"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree1
@@ -3848,6 +4141,18 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite za izradu nove fakture kupcu.\n"
+"              </p><p>\n"
+"                Elektronsko fakturisanje OpenERPa omogućava jednostavniju \n"
+"               i bržu naplatu faktura. Vaš kupac prima fakturu emailom i "
+"može\n"
+"                plaćati online i/ili uvesti fakturu u svoj sistem.\n"
+"              </p><p>\n"
+"                Razgovori s vašim kupcem  su automatski prikazani\n"
+"                na dnu svake fakture.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -3870,7 +4175,7 @@
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
 msgid "Period Length (days)"
-msgstr ""
+msgstr "Dužina perioda (dana)"
 
 #. module: account
 #: code:addons/account/account.py:1363
@@ -3879,11 +4184,13 @@
 "You cannot modify a posted entry of this journal.\n"
 "First you should set the journal to allow cancelling entries."
 msgstr ""
+"Ne možete mijenjati knjižene stavke ovog dnevnika.\n"
+"Prvo je potrebno u dnevniku omogućiti otkazivanje stavki."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr ""
+msgstr "Ispiši dnevnik Prodaje/Nabave"
 
 #. module: account
 #: view:account.installer:0
@@ -3894,7 +4201,7 @@
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Kategorija proizvoda"
 
 #. module: account
 #: code:addons/account/account.py:930
@@ -3903,18 +4210,20 @@
 "There is no fiscal year defined for this date.\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"Nema definisane poslovne godine za ovaj datum.\n"
+"Molimo kreirajte jednu u postavkama menija Računovodstvo"
 
 #. module: account
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr ""
+msgstr "Kreiraj  konto"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "The entries to reconcile should belong to the same company."
-msgstr ""
+msgstr "Stavke za zatvaranje trebale bi pripadati istoj kompaniji."
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -3924,7 +4233,7 @@
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr ""
+msgstr "Otvorene stavke dnevnika"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3935,6 +4244,7 @@
 #: help:account.config.settings,default_purchase_tax:0
 msgid "This purchase tax will be assigned by default on new products."
 msgstr ""
+"Ovaj porez nabave će biti dodijeljen kao zadani svim novim proizvodima."
 
 #. module: account
 #: report:account.invoice:0
@@ -3961,17 +4271,17 @@
 #. module: account
 #: view:account.tax.chart:0
 msgid "(If you do not select period it will take all open periods)"
-msgstr ""
+msgstr "(prazno - sva otvorena razdoblja)"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_cashbox_line
 msgid "account.journal.cashbox.line"
-msgstr ""
+msgstr "account.journal.cashbox.line"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr ""
+msgstr "Proces zatvaranja, partner po partner"
 
 #. module: account
 #: view:account.chart:0
@@ -4024,7 +4334,7 @@
 #. module: account
 #: view:account.move:0
 msgid "Post"
-msgstr ""
+msgstr "Knjiži"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -4045,6 +4355,9 @@
 "based on partner payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"Datum dospijeća stavke generisan stavkom modela '%s' od modela '%s' se "
+"bazira na načinu plaćanja partnera!\n"
+"Molimo odredite partnera na njemu!"
 
 #. module: account
 #: report:account.account.balance:0
@@ -4060,7 +4373,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr ""
+msgstr "Budžeti"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -4079,18 +4392,18 @@
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
 msgid "No Filters"
-msgstr ""
+msgstr "Bez filtera"
 
 #. module: account
 #: view:account.invoice.report:0
 #: model:res.groups,name:account.group_proforma_invoices
 msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "ProForma fakture"
 
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Istorija"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -4105,7 +4418,7 @@
 #. module: account
 #: field:account.config.settings,group_check_supplier_invoice_total:0
 msgid "Check the total of supplier invoices"
-msgstr ""
+msgstr "Provjeri iznos na fakturi dobavljača"
 
 #. module: account
 #: view:account.tax:0
@@ -4119,12 +4432,14 @@
 "When monthly periods are created. The status is 'Draft'. At the end of "
 "monthly period it is in 'Done' status."
 msgstr ""
+"Kada se stvore mjesečni periodi imaju status 'U pripremi', na kraju mjeseca "
+"status se mijenja u 'Gotovo'"
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,product_qty:0
 msgid "Qty"
-msgstr ""
+msgstr "Kol."
 
 #. module: account
 #: help:account.tax.code,sign:0
@@ -4133,11 +4448,13 @@
 "the amount of this case into its parent. For example, set 1/-1 if you want "
 "to add/substract it."
 msgstr ""
+"Koeficijent zbrajanja na nadređenu grupu. Npr.  1/-1 za zbrajanje/oduzimanje "
+"ili 0 za izostavljanje."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Search Analytic Lines"
-msgstr ""
+msgstr "Pretraži analitičke stavke"
 
 #. module: account
 #: field:res.partner,property_account_payable:0
@@ -4148,7 +4465,7 @@
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
 #, python-format
 msgid "The periods to generate opening entries cannot be found."
-msgstr ""
+msgstr "Periodi za stvaranje početnih stanja nisu pronađeni."
 
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
@@ -4171,12 +4488,12 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tree1
 msgid "Analytic Items"
-msgstr ""
+msgstr "Analitičke stavke"
 
 #. module: account
 #: field:analytic.entries.report,nbr:0
 msgid "#Entries"
-msgstr ""
+msgstr "#Stavki"
 
 #. module: account
 #: view:account.state.open:0
@@ -4186,14 +4503,22 @@
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr ""
+msgstr "Koeficijent poreske grupe"
 
 #. module: account
 #: field:account.config.settings,complete_tax_set:0
 msgid "Complete set of taxes"
-msgstr ""
-
-#. module: account
+msgstr "Potpuni popis poreza"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Full Reconciliation Date"
+msgstr "Zadnji datum kompletnog zatvaranja"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.account,name:0
 #: field:account.account.template,name:0
 #: report:account.analytic.account.inverted.balance:0
@@ -4209,12 +4534,12 @@
 #: code:addons/account/installer.py:115
 #, python-format
 msgid "No unconfigured company !"
-msgstr ""
+msgstr "Nema nepodešenih kompanija!"
 
 #. module: account
 #: field:res.company,expects_chart_of_accounts:0
 msgid "Expects a Chart of Accounts"
-msgstr ""
+msgstr "Očekuje kontni plan"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -4225,29 +4550,29 @@
 #: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account."
-msgstr ""
+msgstr "Dnevnik mora imati zadani dugovni i potražni konto."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_tree
 #: model:ir.ui.menu,name:account.menu_action_bank_tree
 msgid "Setup your Bank Accounts"
-msgstr ""
+msgstr "Upišite vaše bankovne račune"
 
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
-msgstr ""
+msgstr "ID Partnera"
 
 #. module: account
 #: help:account.bank.statement,message_ids:0
 #: help:account.invoice,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Poruke i istorija komunikacije"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr ""
+msgstr "Dnevnik za analitiku"
 
 #. module: account
 #: constraint:account.aged.trial.balance:0
@@ -4268,6 +4593,8 @@
 "The fiscalyear, periods or chart of account chosen have to belong to the "
 "same company."
 msgstr ""
+"Fiskalna godina, periodi ili odabrani kontni plan moraju pripadati istoj "
+"kompaniji."
 
 #. module: account
 #: help:account.tax.code.template,notprintable:0
@@ -4275,13 +4602,15 @@
 "Check this box if you don't want any tax related to this tax Code to appear "
 "on invoices."
 msgstr ""
+"Označite ovo polje ako ne želite da se porezi povezani sa ovim poreznim "
+"kodom pojavljuju na računima."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1058
 #: code:addons/account/account_move_line.py:1143
 #, python-format
 msgid "You cannot use an inactive account."
-msgstr ""
+msgstr "Nije moguće koristiti neaktivni konto"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -4300,7 +4629,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current year"
-msgstr ""
+msgstr "Stavke dnevnika u tekućoj godini"
 
 #. module: account
 #: field:account.account,child_consol_ids:0
@@ -4312,7 +4641,7 @@
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Nedovoljno podataka!"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
@@ -4320,11 +4649,13 @@
 "Value of Loss or Gain due to changes in exchange rate when doing multi-"
 "currency transactions."
 msgstr ""
+"Vrijednost dobiti ili gubitka usljed kursnih razlika kad se koristi više "
+"valutne transakcije."
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "General Accounting"
-msgstr ""
+msgstr "Glavna knjiga"
 
 #. module: account
 #: help:account.fiscalyear.close,journal_id:0
@@ -4334,11 +4665,15 @@
 "debit/credit accounts, of type 'situation' and with a centralized "
 "counterpart."
 msgstr ""
+"Najbolja praksa je definisati dnevnik(e) na kojima se knjiže početna stanja "
+"svih poslovnih godina. Za ove dnevnike treba definisati dugovni i potražni "
+"konto protustavki, a vrsta dnevnika mora biti 'Početno stanje' sa "
+"centraliziranom(jednom) protustavkom."
 
 #. module: account
 #: view:account.installer:0
 msgid "title"
-msgstr ""
+msgstr "Naslov"
 
 #. module: account
 #: view:account.invoice:0
@@ -4349,12 +4684,12 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "Ponavljajuće stavke"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr ""
+msgstr "Prikaži partnere"
 
 #. module: account
 #: view:account.invoice:0
@@ -4364,17 +4699,17 @@
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
 msgid "Assets"
-msgstr ""
+msgstr "Imovina"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "Accounting & Finance"
-msgstr ""
+msgstr "Računovodstvo i Financije"
 
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "Potvrdi fakture"
 
 #. module: account
 #: selection:account.account,currency_mode:0
@@ -4386,7 +4721,7 @@
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "Prikaži konta"
 
 #. module: account
 #: view:account.state.open:0
@@ -4396,12 +4731,12 @@
 #. module: account
 #: field:account.tax,account_analytic_collected_id:0
 msgid "Invoice Tax Analytic Account"
-msgstr ""
+msgstr "Analitički konto poreza faktura"
 
 #. module: account
 #: field:account.chart,period_from:0
 msgid "Start period"
-msgstr ""
+msgstr "Početni period"
 
 #. module: account
 #: field:account.tax,name:0
@@ -4434,6 +4769,8 @@
 "This payment term will be used instead of the default one for sale orders "
 "and customer invoices"
 msgstr ""
+"Ovaj uslov plaćanja će biti korišten umjesto zadanog za prodajne narudžbe i "
+"fakture."
 
 #. module: account
 #: view:account.config.settings:0
@@ -4441,33 +4778,34 @@
 "If you put \"%(year)s\" in the prefix, it will be replaced by the current "
 "year."
 msgstr ""
+"Ako stavite \"%(year)s\" u prefiks, biti će zamijenjeno sa tekućom godinom."
 
 #. module: account
 #: help:account.account,active:0
 msgid ""
 "If the active field is set to False, it will allow you to hide the account "
 "without removing it."
-msgstr ""
+msgstr "Neaktivna konta se neće prikazivati u listama odabira."
 
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr ""
+msgstr "Knjižene stavke dnevnika"
 
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "No Follow-up"
-msgstr ""
+msgstr "Ne prati"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Pretraži predloške poreza"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr ""
+msgstr "Stavke u stanju \"U pripremi\""
 
 #. module: account
 #: help:account.config.settings,decimal_precision:0
@@ -4476,6 +4814,8 @@
 "9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: "
 "0.0231 EUR."
 msgstr ""
+"Na primjer, decimalna preciznost 2 dozvoljava unose kao 9,99 KM, dok "
+"decimalna preciznost od 4 dozvoljava unose tipa 0,0231 KM"
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -4537,13 +4877,53 @@
 "          </p>\n"
 "        "
 msgstr ""
-
-#. module: account
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Kliknite za podešavanje novog bankovnog računa. \n"
+"          </p><p>\n"
+"            Podesite bankovni račun vaše kompanije i odaberite one koji se\n"
+"            moraju pojaviti u podnožju izvještaja.\n"
+"          </p><p>\n"
+"            Ako koristite računovodstvo OpenERPa, dnevnici i\n"
+"            konta će se kreirati automatski na bazi ovih podataka.\n"
+"          </p>\n"
+"        "
+
+#. module: account
+<<<<<<< TREE
+=======
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr "Otkaži odabrane račune"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:424
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr "Morate dodijeliti analitički dnevnik na '%s' dnevniku!"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+"Analitički troškovi (ev. rada, nabava, ...) dolaze sa analitičkih konta. Oni "
+"mogu kreirati fakture dobavljača u pripremi."
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "Zatvori blagajnu"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: constraint:account.tax.code.template:0
 msgid ""
 "Error!\n"
 "You cannot create recursive Tax Codes."
 msgstr ""
+"Greška !\n"
+"Nije moguće stvarati rekurzivne poreske kodove"
 
 #. module: account
 #: constraint:account.period:0
@@ -4551,6 +4931,8 @@
 "Error!\n"
 "The duration of the Period(s) is/are invalid."
 msgstr ""
+"Greška!\n"
+"Trajanje perioda nije ispravno."
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4567,12 +4949,12 @@
 #: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
-msgstr ""
+msgstr "Ne možete mijenjati šifru konta koji ima stavke dnevnika!"
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
 msgid "Supplier invoice sequence"
-msgstr ""
+msgstr "Sekvenca faktura dobavljača"
 
 #. module: account
 #: code:addons/account/account_invoice.py:610
@@ -4582,28 +4964,30 @@
 "Cannot find a chart of account, you should create one from Settings\\"
 "Configuration\\Accounting menu."
 msgstr ""
+"Nije moguće pronaći kontni pan, trebate kreirati jedan iz menija Postavke\\"
+"Konfiguracija\\Računovodstvo."
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Jedinica mjere proizvoda"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "PayPal račun"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr ""
+msgstr "Tip konta"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Checks"
-msgstr ""
+msgstr "Banka i Čekovi"
 
 #. module: account
 #: field:account.account.template,note:0
@@ -4613,14 +4997,14 @@
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Reverse balance sign"
-msgstr ""
+msgstr "Obrnuti predznak salda"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "Bilans (konto obveza)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4631,24 +5015,25 @@
 #: view:account.bank.statement:0
 #: field:account.cashbox.line,subtotal_closing:0
 msgid "Closing Subtotal"
-msgstr ""
+msgstr "Subtotal zatvaranja"
 
 #. module: account
 #: field:account.tax,base_code_id:0
 msgid "Account Base Code"
-msgstr ""
+msgstr "Porezna grupa osnovice"
 
 #. module: account
 #: code:addons/account/account_move_line.py:864
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
-msgstr ""
+msgstr "Morate predvidjeti konto za otpis / kursnu razliku."
 
 #. module: account
 #: help:res.company,paypal_account:0
 msgid "Paypal username (usually email) for receiving online payments."
 msgstr ""
+"PAyPal korisničko ima (obično e-mail adresa) za primanje online uplata."
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -4680,29 +5065,34 @@
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
 msgid "Check if you want to display Accounts with 0 balance too."
-msgstr ""
+msgstr "Označite ako želite prikazivati konta sa saldom 0 također."
 
 #. module: account
 #: field:account.move.reconcile,opening_reconciliation:0
 msgid "Opening Entries Reconciliation"
-msgstr ""
+msgstr "Zatvaranje stavaka početnog stanja"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
 #, python-format
+<<<<<<< TREE
 msgid "Last Reconciliation:"
 msgstr ""
+=======
+msgid "End of Fiscal Year Entry"
+msgstr "Zapisi zatvaranja fiskalne godine"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
-msgstr ""
+msgstr "Izravnato"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "Izvod iz faktura ili plaćanja"
 
 #. module: account
 #: code:addons/account/installer.py:115
@@ -4711,26 +5101,36 @@
 "There is currently no company without chart of account. The wizard will "
 "therefore not be executed."
 msgstr ""
-
-#. module: account
+"Trenutno nema kompanije bez kontnog plana. Čarobnjak se neće pokretati."
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Add an internal note..."
+msgstr "Dodaj internu zabilješku ..."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Posdesite opcije računovodtsva"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
-msgstr ""
+msgstr "Kontni plan"
 
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Payment Reference"
-msgstr ""
+msgstr "Referenca plaćanja"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Main Title 1 (bold, underlined)"
-msgstr ""
+msgstr "Glavni naslov 1 (podebljan, podvučeni)"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -4741,28 +5141,28 @@
 #. module: account
 #: help:account.fiscalyear.close,report_name:0
 msgid "Give name of the new entries"
-msgstr ""
+msgstr "Nazovi nove stavke"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Statistika faktura"
 
 #. module: account
 #: field:account.account,exchange_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "Kurs"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
 msgid "Bank statements are entered in the system."
-msgstr ""
+msgstr "Izvodi su unoseni u sistem."
 
 #. module: account
 #: code:addons/account/wizard/account_reconcile.py:122
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr ""
+msgstr "Zatvaranje s otpisom."
 
 #. module: account
 #: view:account.account.template:0
@@ -4773,17 +5173,17 @@
 #. module: account
 #: view:account.bank.statement:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Završni bilans"
 
 #. module: account
 #: field:account.chart.template,visible:0
 msgid "Can be Visible?"
-msgstr ""
+msgstr "Može biti vidljivo?"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_select
 msgid "Account Journal Select"
-msgstr ""
+msgstr "Izbor dnevnika"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4794,27 +5194,27 @@
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
 msgid "Journal Items to Reconcile"
-msgstr ""
+msgstr "Stavke dnevnika za zatvaranje"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "Templates for Taxes"
-msgstr ""
+msgstr "Predlošci poreza"
 
 #. module: account
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
-msgstr ""
+msgstr "Naziv perioda mora biti jedinstven unutar kompanije"
 
 #. module: account
 #: help:wizard.multi.charts.accounts,currency_id:0
 msgid "Currency as per company's country."
-msgstr ""
+msgstr "Valuta prema državi kompanije."
 
 #. module: account
 #: view:account.tax:0
 msgid "Tax Computation"
-msgstr ""
+msgstr "Izračun poreza"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4829,6 +5229,9 @@
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
+"Isključite ovo ako ne želite da se ovaj predložak aktivno koristi u "
+"čarobnjaku koji generiše kontni plan iz predložaka. Ovo je vrlo korisno kada "
+"želite generisati konta ovog predloška samo iz podređenog predloška."
 
 #. module: account
 #: view:account.use.model:0
@@ -4847,6 +5250,8 @@
 "Error!\n"
 "You cannot create an account which has parent account of different company."
 msgstr ""
+"Greška!\n"
+"Ne možete kreirati konto koji ima nadređeni konto druge komapnije."
 
 #. module: account
 #: code:addons/account/account_invoice.py:658
@@ -4857,11 +5262,15 @@
 "You can create one in the menu: \n"
 "Configuration\\Journals\\Journals."
 msgstr ""
+"Nema dnevnika tipa %s za ovu kompaniju.\n"
+"\n"
+"Možete kreirati jedan iz menija: \n"
+"Konfiguracija\\Dnevnici\\Dnevnici."
 
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Based On"
-msgstr ""
+msgstr "Na osnovu"
 
 #. module: account
 #: code:addons/account/account.py:3204
@@ -4872,17 +5281,17 @@
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger_journal_report
 msgid "Account Analytic Cost Ledger For Journal Report"
-msgstr ""
+msgstr "Analitička knjiga troškova za dnevnički izvještaj"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_model_form
 msgid "Recurring Models"
-msgstr ""
+msgstr "Ponavljajući modeli"
 
 #. module: account
 #: view:account.tax:0
 msgid "Children/Sub Taxes"
-msgstr ""
+msgstr "Podređeni porezi"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -4897,12 +5306,20 @@
 #. module: account
 #: help:account.journal,default_credit_account_id:0
 msgid "It acts as a default account for credit amount"
-msgstr ""
-
-#. module: account
+msgstr "Zadani konto za potražni iznos"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.move.line:0
+msgid "Number (Move)"
+msgstr "Broj (kretanja)"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:cash.box.out:0
 msgid "Describe why you take money from the cash register:"
-msgstr ""
+msgstr "Opišite kad uzimate novac iz blagajne :"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -4912,14 +5329,23 @@
 msgstr "Otkazano"
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1903
+#, python-format
+msgid " (Copy)"
+msgstr " (kopija)"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
-msgstr ""
+msgstr "Dozvoljava izradu ProForma faktura"
 
 #. module: account
 #: view:account.journal:0
 msgid "Unit Of Currency Definition"
-msgstr ""
+msgstr "Definicija jedinice valute"
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -4928,24 +5354,26 @@
 "It adds the currency column on report if the currency differs from the "
 "company currency."
 msgstr ""
+"Dodaje kolonu valute na izvještaj ukoliko se valuta razlikuje od glavne "
+"valute kompanije."
 
 #. module: account
 #: code:addons/account/account.py:3394
 #, python-format
 msgid "Purchase Tax %.2f%%"
-msgstr ""
+msgstr "Porezi nabave %.2f%%"
 
 #. module: account
 #: view:account.subscription.generate:0
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr ""
+msgstr "Generiši stavke"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Odabir stabla poreza"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -4957,29 +5385,37 @@
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Potvrđen"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Otkazana faktura"
 
 #. module: account
 #: view:account.invoice:0
 msgid "My Invoices"
-msgstr ""
+msgstr "Moje fakture"
 
 #. module: account
 #: selection:account.bank.statement,state:0
 msgid "New"
-msgstr ""
+msgstr "Novi"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Sale Tax"
-msgstr ""
-
-#. module: account
+msgstr "Porez prodaje"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.move:0
+msgid "Cancel Entry"
+msgstr "Otkaži unos"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
@@ -4988,7 +5424,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Invoice "
-msgstr ""
+msgstr "Faktura "
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
@@ -5002,14 +5438,25 @@
 "printed it comes to 'Printed' status. When all transactions are done, it "
 "comes in 'Done' status."
 msgstr ""
+"Kada se kreira razdoblje dnevnika. Status je 'U pripremi'. Ako je izvještaj "
+"ispisan postaje 'Ispisan' status. Kada su sve transakcije završene, prelazi "
+"u 'Završen' status."
 
 #. module: account
 #: code:addons/account/account.py:3205
 #, python-format
 msgid "MISC"
-msgstr ""
-
-#. module: account
+msgstr "RAZNO"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:res.partner:0
+msgid "Accounting-related settings are managed on"
+msgstr "Postavke računovodstva se vode na"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.fiscalyear.close,fy2_id:0
 msgid "New Fiscal Year"
 msgstr "Nova fiskalna godina"
@@ -5030,13 +5477,13 @@
 #. module: account
 #: help:account.config.settings,expects_chart_of_accounts:0
 msgid "Check this box if this company is a legal entity."
-msgstr ""
+msgstr "Označite ovdje ako je ova kompanija zasebna pravna osoba"
 
 #. module: account
 #: model:account.account.type,name:account.conf_account_type_chk
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr ""
+msgstr "Ček"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -5076,17 +5523,17 @@
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "or"
-msgstr ""
+msgstr "ili"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturisano"
 
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr ""
+msgstr "Knjiženi zapisi dnevnika"
 
 #. module: account
 #: view:account.use.model:0
@@ -5100,11 +5547,14 @@
 "account if this is a Customer Invoice or Supplier Refund, otherwise a "
 "Partner bank account number."
 msgstr ""
+"Broj bankovnog računa na koji faktura treba biti uplaćena. Broj računa "
+"kompanije ukoliko je ovo faktura kupca ili povrat od dobavljača, u suprotnom "
+"broj računa partnera ."
 
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr ""
+msgstr "Danas zatvoreni partneri"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
@@ -5114,7 +5564,7 @@
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "Dodaj"
 
 #. module: account
 #: selection:account.invoice,state:0
@@ -5136,7 +5586,7 @@
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr ""
+msgstr "Fakture u pripremi su potvrđene. "
 
 #. module: account
 #: help:account.tax,account_collected_id:0
@@ -5149,17 +5599,17 @@
 #: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
-msgstr ""
+msgstr "Početni period"
 
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
-msgstr ""
+msgstr "Zapisi dnevnika za pregledati"
 
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round Globally"
-msgstr ""
+msgstr "Zaokruži globalno"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5168,6 +5618,14 @@
 msgstr "Izračunaj"
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:account.invoice:0
+msgid "Additional notes..."
+msgstr "Dodatne zabilješke..."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
 msgstr "Porezna prijava"
@@ -5179,6 +5637,8 @@
 "Please verify the price of the invoice !\n"
 "The encoded total does not match the computed total."
 msgstr ""
+"Molimo provjerite iznos fakture!\n"
+"Unešeni iznos ne odgovara izračunatoj sumi."
 
 #. module: account
 #: field:account.account,active:0
@@ -5194,7 +5654,7 @@
 #: view:account.bank.statement:0
 #: field:account.journal,cash_control:0
 msgid "Cash Control"
-msgstr ""
+msgstr "Kontrola gotovine"
 
 #. module: account
 #: field:account.analytic.balance,date2:0
@@ -5208,12 +5668,12 @@
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
-msgstr ""
+msgstr "Plaćanje faktura"
 
 #. module: account
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Broj fakture se ne smije ponavljati za jednu organizaciju."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
@@ -5229,7 +5689,7 @@
 #. module: account
 #: model:res.groups,name:account.group_account_user
 msgid "Accountant"
-msgstr ""
+msgstr "Računovođa"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_treasury_report_all
@@ -5237,16 +5697,18 @@
 "From this view, have an analysis of your treasury. It sums the balance of "
 "every accounting entries made on liquidity accounts per period."
 msgstr ""
+"Iz ovog pogleda imate analizu vaših financija. Zbraja saldo svakog unosa na "
+"kontima likvidnosti po periodu."
 
 #. module: account
 #: model:res.groups,name:account.group_account_manager
 msgid "Financial Manager"
-msgstr ""
+msgstr "Menadžer financija"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr ""
+msgstr "Grupiši stavke fakture"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -5262,29 +5724,39 @@
 #: field:account.bank.statement,details_ids:0
 #: view:account.journal:0
 msgid "CashBox Lines"
-msgstr ""
+msgstr "Stavke blagajne"
 
 #. module: account
 #: model:ir.model,name:account.model_account_vat_declaration
 msgid "Account Vat Declaration"
-msgstr ""
-
-#. module: account
+msgstr "Poreska prijava"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.bank.statement:0
+msgid "Cancel Statement"
+msgstr "Otkaži izvod"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.config.settings,module_account_accountant:0
 msgid ""
 "If you do not check this box, you will be able to do invoicing & payments, "
 "but not accounting (Journal Items, Chart of  Accounts, ...)"
 msgstr ""
+"Ukoliko ne označite ovo polje, možete izrađivati račune i vršiti plaćanja, "
+"ali bez računovodstva (dnevnici, kontni plan, ...)"
 
 #. module: account
 #: view:account.period:0
 msgid "To Close"
-msgstr ""
+msgstr "Za zatvoriti"
 
 #. module: account
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
-msgstr ""
+msgstr "Datum početka perioda"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
@@ -5352,12 +5824,14 @@
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
 msgstr ""
+"Kretanje ne može biti brisano ako je povezano sa fakturom. (Faktura: %s -"
+"Kretanje br:%s)"
 
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_opening:0
 msgid "Opening Unit Numbers"
-msgstr ""
+msgstr "Brojevi otvaranja"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -5396,13 +5870,16 @@
 "encode the sale and purchase rates or choose from list of taxes. This last "
 "choice assumes that the set of tax defined on this template is complete"
 msgstr ""
+"Ovaj izbor Vam pomaže odlučiti da li želite korisniku predložiti da unosi "
+"stope poreza kod nabave i prodaje ili da odabere iz popisa poreza. Ovo drugo "
+"podrazumijeva da je set poreza na ovom predlošku potpun."
 
 #. module: account
 #: view:account.financial.report:0
 #: field:account.financial.report,children_ids:0
 #: model:ir.model,name:account.model_account_financial_report
 msgid "Account Report"
-msgstr ""
+msgstr "Izvještaj konta"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -5415,12 +5892,12 @@
 #: view:report.account_type.sales:0
 #: field:report.account_type.sales,name:0
 msgid "Year"
-msgstr ""
+msgstr "Godina"
 
 #. module: account
 #: help:account.invoice,sent:0
 msgid "It indicates that the invoice has been sent."
-msgstr ""
+msgstr "Označava da je faktura poslana"
 
 #. module: account
 #: field:account.tax.template,description:0
@@ -5435,11 +5912,14 @@
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Nije moguće kreirati automatsku sekvencu za ovaj dio.\n"
+"Stavite sekvencu u definiciju dnevnika za automatsku dodjelu broja ili "
+"kreirate sekvencu ručno za ovaj dio."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Pro Forma Invoice "
-msgstr ""
+msgstr "ProForma faktura "
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -5450,7 +5930,7 @@
 #: view:account.move.line:0
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr ""
+msgstr "Sljedeći partner za zatvaranje"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
@@ -5463,24 +5943,24 @@
 #: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
-msgstr ""
+msgstr "Bilans stanja"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr ""
+msgstr "Dobit i gubitak (konto prihoda)"
 
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date in Period"
-msgstr ""
+msgstr "Provjerite datum u periodu"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
 msgid "Accounting Reports"
-msgstr ""
+msgstr "Računovodstveni izvještaji"
 
 #. module: account
 #: field:account.move,line_id:0
@@ -5492,7 +5972,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "This Period"
-msgstr ""
+msgstr "Ovaj period"
 
 #. module: account
 #: view:account.tax.template:0
@@ -5505,6 +5985,7 @@
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
 msgstr ""
+"Nije moguće pronaći kontni plan za ovu kompaniju, trebali bi napraviti jedan."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -5521,7 +6002,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr ""
+msgstr "Automatsko zatvaranje"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5556,7 +6037,7 @@
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Validation"
-msgstr ""
+msgstr "Odobrenje"
 
 #. module: account
 #: help:account.bank.statement,message_summary:0
@@ -5565,6 +6046,8 @@
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Sadrži sažetak konverzacije (broj poruka,..). Ovaj sažetak je u html formatu "
+"da bi mogao biti ubačen u kanban pogled."
 
 #. module: account
 #: field:account.tax,child_depend:0
@@ -5596,11 +6079,14 @@
 "payment term!\n"
 "Please define partner on it!"
 msgstr ""
+"Datum dospijeća stavke unosa generiše se od strane modela linije '%s', te se "
+"temelji se na roku plaćanja partnera!  \n"
+"Molimo definišite partnera!"
 
 #. module: account
 #: field:account.tax.code,sign:0
 msgid "Coefficent for parent"
-msgstr ""
+msgstr "Koeficijent za nadređenog"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -5610,12 +6096,12 @@
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Napredak"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Cash and Banks"
-msgstr ""
+msgstr "Banka i blagajna"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
@@ -5625,13 +6111,13 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Recompute taxes and total"
-msgstr ""
+msgstr "Ponovo izračunaj poreze i ukupni iznos"
 
 #. module: account
 #: code:addons/account/account.py:1116
 #, python-format
 msgid "You cannot modify/delete a journal with entries for this period."
-msgstr ""
+msgstr "Ne možete mijenjati/brisati dnevnik sa unosima za ovaj period."
 
 #. module: account
 #: field:account.tax.template,include_base_amount:0
@@ -5641,7 +6127,7 @@
 #. module: account
 #: field:account.invoice,supplier_invoice_number:0
 msgid "Supplier Invoice Number"
-msgstr ""
+msgstr "Broj fakture dobavljača"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5655,13 +6141,14 @@
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Amount Computation"
-msgstr ""
+msgstr "Izračun iznosa"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "You can not add/modify entries in a closed period %s of journal %s."
 msgstr ""
+"Ne možete dodavati/mijenjati unose u zatvorenom periodu %s dnevnika %s."
 
 #. module: account
 #: view:account.journal:0
@@ -5686,12 +6173,12 @@
 #. module: account
 #: model:account.account.type,name:account.account_type_asset_view1
 msgid "Asset View"
-msgstr ""
+msgstr "Pogled aktive"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
 msgid "Account Common Account Report"
-msgstr ""
+msgstr "Izvještaj za uobičajena konta"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -5719,12 +6206,15 @@
 "that you should have your last line with the type 'Balance' to ensure that "
 "the whole amount will be treated."
 msgstr ""
+"Odaberite vrstu ovjere povezanu sa ovim načinom plaćanja. Imajte na umu da "
+"vaša zadnja stavka mora biti tip 'saldo' kako bi osigurali da će cijeli "
+"iznos biti zahvaćen."
 
 #. module: account
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include Initial Balances"
-msgstr ""
+msgstr "Uključi početna stanja"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -5759,18 +6249,18 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund "
-msgstr ""
+msgstr "Povrat u pripremi "
 
 #. module: account
 #: view:cash.box.in:0
 msgid "Fill in this form if you put money in the cash register:"
-msgstr ""
+msgstr "Ispunite ovaj obrazac za polaganje novca u blagajnu:"
 
 #. module: account
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr ""
+msgstr "Iznos za uplatu"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5779,6 +6269,9 @@
 "something to reconcile or not. This figure already count the current partner "
 "as reconciled."
 msgstr ""
+"Ovo su preostali partneri za koje biste trebali provjeriti da li je ostalo "
+"nešto za zatvaranje ili ne. Ova brojka već uključuje trenutnog partnera kao "
+"zatvorenog."
 
 #. module: account
 #: view:account.subscription.line:0
@@ -5788,7 +6281,7 @@
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr ""
+msgstr "Količine proizvoda"
 
 #. module: account
 #: view:account.entries.report:0
@@ -5797,31 +6290,31 @@
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr ""
+msgstr "Neknjiženo"
 
 #. module: account
 #: view:account.change.currency:0
 #: model:ir.actions.act_window,name:account.action_account_change_currency
 #: model:ir.model,name:account.model_account_change_currency
 msgid "Change Currency"
-msgstr ""
+msgstr "Promjeni valutu"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
 #: model:process.node,note:account.process_node_supplieraccountingentries0
 msgid "Accounting entries."
-msgstr ""
+msgstr "Računovodstveni unosi."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Payment Date"
-msgstr ""
+msgstr "Datum plaćanja"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,opening_details_ids:0
 msgid "Opening Cashbox Lines"
-msgstr ""
+msgstr "Stavke početnog stanja blagajne"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -5833,7 +6326,7 @@
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer Invoices And Refunds"
-msgstr ""
+msgstr "Računi i povrati kupaca"
 
 #. module: account
 #: field:account.analytic.line,amount_currency:0
@@ -5846,7 +6339,7 @@
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round per Line"
-msgstr ""
+msgstr "Zaokruži po liniji"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5867,16 +6360,31 @@
 #: view:account.move.line:0
 msgid "Number (Move)"
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite za kreiranje dnevnički zapis.\n"
+"              </p><p>\n"
+"                Dnevnički zapis se sastoji od nekoliko stavaka dnevnika, "
+"svaki\n"
+"                od kojih je ili dugovna ili potražna transakcija.\n"
+"              </p><p>\n"
+"                OpenERP automatski kreira dnevnički zapis po "
+"računovodstvenom\n"
+"                dokumentu: faktura, povrat, plaćanje dobavljaču, izvod,\n"
+"                itd. Prema tome, ručno unositi dnevničke zapise bi trebali "
+"samo/uglavnom\n"
+"                za ostale razne operacije.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Normal Text"
-msgstr ""
+msgstr "Običan tekst"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
 msgid "Payment entries are the second input of the reconciliation."
-msgstr ""
+msgstr "Stavke plaćanja su drugi unos zatvaranja."
 
 #. module: account
 #: help:res.partner,property_supplier_payment_term:0
@@ -5884,19 +6392,38 @@
 "This payment term will be used instead of the default one for purchase "
 "orders and supplier invoices"
 msgstr ""
-
-#. module: account
+"Ovaj će se način plaćanja koristiti kao predodređen za nabavne narudžbe i "
+"fakture dobavljača."
+
+#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:474
+#, 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 ""
+"Ne možete obrisati fakturu nakon što je potvrđena (i dobio je broj). Možete "
+"ga vratiti u 'U pripremu' i promijeniti njegov sadržaj, zatim ga ponovo "
+"potvrditi."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.automatic.reconcile,power:0
 msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
 "be chosen as the power of the automatic reconciliation"
 msgstr ""
+"Višekratnik automatskog zatvaranja je broj pojedinačnih iznosa koji će se "
+"kombinirati kod traženja odgovarajućeg iznosa"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:56
 #, python-format
 msgid "You must set a period length greater than 0."
-msgstr ""
+msgstr "Morate postaviti dužinu perioda veću od 0"
 
 #. module: account
 #: view:account.fiscal.position.template:0
@@ -5907,7 +6434,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund"
-msgstr ""
+msgstr "Povrat u pripremi"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -5929,12 +6456,12 @@
 #. module: account
 #: view:account.bank.statement:0
 msgid "Open CashBox"
-msgstr ""
+msgstr "Otvori blagajnu"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Automatic formatting"
-msgstr ""
+msgstr "Automatsko oblikovanje"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -5944,7 +6471,7 @@
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on an account of type view."
-msgstr ""
+msgstr "Ne možete kreirati stavke dnevnika na kontu koji je tipa pogled."
 
 #. module: account
 #: selection:account.payment.term.line,value:0
@@ -5957,23 +6484,24 @@
 #, python-format
 msgid "You cannot change the tax, you should remove and recreate lines."
 msgstr ""
+"Nije oguće mijenjanje poreza, morate obrisati i ponovo unesti stavke."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr ""
+msgstr "Automatsko zatvaranje"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr ""
+msgstr "Stavka dnevnika"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Opening Entries"
-msgstr ""
+msgstr "Kreiraj početno stanje"
 
 #. module: account
 #: help:account.tax,type:0
@@ -5983,7 +6511,7 @@
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due Date Computation"
-msgstr ""
+msgstr "Izračun datuma dospjeća"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
@@ -5996,7 +6524,7 @@
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journals"
-msgstr ""
+msgstr "Analitički dnevnici"
 
 #. module: account
 #: field:account.account,child_id:0
@@ -6007,7 +6535,7 @@
 #: code:addons/account/account_move_line.py:1117
 #, python-format
 msgid "Move name (id): %s (%s)"
-msgstr ""
+msgstr "Naziv knjiženja (id): %s (%s)"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -6019,7 +6547,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "entries"
-msgstr ""
+msgstr "zapisi"
 
 #. module: account
 #: field:res.partner,debit:0
@@ -6049,9 +6577,19 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "March"
+msgstr "Mart"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account.py:1031
+#, python-format
+msgid "You can not re-open a period which belongs to closed fiscal year"
 msgstr ""
+"Ne možete ponovo otvoriti period koji pripada zatvorenoj fiskalnog godini."
 
 #. module: account
+>>>>>>> MERGE-SOURCE
 #: report:account.analytic.account.journal:0
 msgid "Account n°"
 msgstr "Broj računa"
@@ -6060,7 +6598,7 @@
 #: code:addons/account/account_invoice.py:95
 #, python-format
 msgid "Free Reference"
-msgstr ""
+msgstr "Slobodna vezna oznaka"
 
 #. module: account
 #: selection:account.aged.trial.balance,result_selection:0
@@ -6082,13 +6620,13 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "Select Company"
-msgstr ""
+msgstr "Odaberite kompaniju"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
 #: model:ir.model,name:account.model_account_state_open
 msgid "Account State Open"
-msgstr ""
+msgstr "Stanje konta otvoren"
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -6108,6 +6646,9 @@
 "document shows your debit and credit taking in consideration some criteria "
 "you can choose by using the search tool."
 msgstr ""
+"Iz ovog pogleda imate analizu vaših različitih financijskih konta. Dokument "
+"pokazuje vaše dugove i potražne stavke uzimajući u obzir neke kriterijume "
+"koristeći alat pretrage."
 
 #. module: account
 #: help:account.partner.reconcile.process,progress:0
@@ -6115,6 +6656,8 @@
 "Shows you the progress made today on the reconciliation process. Given by \n"
 "Partners Reconciled Today \\ (Remaining Partners + Partners Reconciled Today)"
 msgstr ""
+"Prikazuje Vaš današnji napredak u postupku zatvaranja.  Dati po\n"
+"partneri zatvoreni danas\\ (preostali partneri + partneri zatvoreni danas)"
 
 #. module: account
 #: field:account.invoice,period_id:0
@@ -6141,17 +6684,27 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klikni za dodavanje konta.\n"
+"              </p><p>\n"
+"                Konto je dio glavne knjige i dozvoljava vašoj kompaniji\n"
+"                evidenciju svih vrsta dugovnih i potražnih transakcija.\n"
+"                Kompanije podnose svoje godišnje izvještaje po kontima u\n"
+"                dva glavna dijela: bilans stanja i račun dobiti i gubitka.\n"
+"                Godišnji izvještaj je zakonska obveza.\n"
+"                </p>\n"
+"            "
 
 #. module: account
 #: view:account.invoice.report:0
 #: field:account.invoice.report,nbr:0
 msgid "# of Lines"
-msgstr ""
+msgstr "# Linija"
 
 #. module: account
 #: view:account.invoice:0
 msgid "(update)"
-msgstr ""
+msgstr "(ažuriraj)"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -6170,13 +6723,13 @@
 #: field:accounting.report,filter:0
 #: field:accounting.report,filter_cmp:0
 msgid "Filter by"
-msgstr ""
+msgstr "Filtriraj po"
 
 #. module: account
 #: code:addons/account/account.py:2334
 #, python-format
 msgid "You have a wrong expression \"%(...)s\" in your model !"
-msgstr ""
+msgstr "Imate pogrešan izraz \"%(...)s\" u vašem modelu !"
 
 #. module: account
 #: view:account.tax.template:0
@@ -6186,12 +6739,12 @@
 #. module: account
 #: help:account.bank.statement,balance_end:0
 msgid "Balance as calculated based on Starting Balance and transaction lines"
-msgstr ""
+msgstr "Saldo se računa na bazi početnog stanja i stavki transakcija."
 
 #. module: account
 #: field:account.journal,loss_account_id:0
 msgid "Loss Account"
-msgstr ""
+msgstr "Konto gubitka"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
@@ -6203,7 +6756,7 @@
 #: model:ir.actions.act_window,name:account.action_account_general_journal
 #: model:ir.model,name:account.model_account_general_journal
 msgid "Account General Journal"
-msgstr ""
+msgstr "Glavna knjiga"
 
 #. module: account
 #: help:account.move,state:0
@@ -6214,6 +6767,11 @@
 "created by the system on document validation (invoices, bank statements...) "
 "and will be created in 'Posted' status."
 msgstr ""
+"Ručno kreirani dnevnički zapisi su obično u statusu 'neknjižen', ali možete "
+"postaviti opciju da preskače taj status na povezanom dnevniku. U tom "
+"slučaju, ponašati će se kao dnevnički zapisi koje sistem kreira automatski  "
+"na potvrdi dokumenata (fakture, izvodi ...) i biti će kreirane u statusu "
+"'knjiženo'."
 
 #. module: account
 #: field:account.payment.term.line,days:0
@@ -6227,16 +6785,18 @@
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"."
 msgstr ""
+"Ne možete knjižiti ovaj dnevnički zapis jer konto \"%s\"  ne pripada kontnom "
+"planu \"%s\"."
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
-msgstr ""
+msgstr "Izvještaj"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr ""
+msgstr "Predložak poreza"
 
 #. module: account
 #: help:account.tax,name:0
@@ -6265,7 +6825,7 @@
 #. module: account
 #: field:account.account,foreign_balance:0
 msgid "Foreign Balance"
-msgstr ""
+msgstr "Inozemni saldo"
 
 #. module: account
 #: field:account.journal.period,name:0
@@ -6275,22 +6835,22 @@
 #. module: account
 #: field:account.invoice.tax,factor_base:0
 msgid "Multipication factor for Base code"
-msgstr ""
+msgstr "Koeficijent za poreznu grupu osnovice"
 
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr ""
+msgstr "Kompanija za koju se vodi ovaj dnevnik"
 
 #. module: account
 #: help:account.config.settings,group_multi_currency:0
 msgid "Allows you multi currency environment"
-msgstr ""
+msgstr "Dozvoljava korištenje više valuta"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Running Subscription"
-msgstr ""
+msgstr "Pretplata u toku"
 
 #. module: account
 #: report:account.invoice:0
@@ -6302,7 +6862,7 @@
 #: model:ir.actions.act_window,name:account.action_analytic_entries_report
 #: model:ir.ui.menu,name:account.menu_action_analytic_entries_report
 msgid "Analytic Entries Analysis"
-msgstr ""
+msgstr "Analiza analitičkih stavki"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
@@ -6315,6 +6875,8 @@
 "This journal will be created automatically for this bank account when you "
 "save the record"
 msgstr ""
+"Ovaj dnevnik će biti kreiran automatski za ovaj bankovni račun kada snimite "
+"zapis."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -6330,7 +6892,7 @@
 #. module: account
 #: field:account.entries.report,date_created:0
 msgid "Date Created"
-msgstr ""
+msgstr "Datum Kreiranja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
@@ -6343,6 +6905,7 @@
 "As soon as the reconciliation is done, the invoice's state turns to “done” "
 "(i.e. paid) in the system."
 msgstr ""
+"Čim je obavljeno zatvaranje, stanje fakture prelazi u \"Gotovo\" (plaćen)."
 
 #. module: account
 #: view:account.chart.template:0
@@ -6359,12 +6922,12 @@
 #: view:account.analytic.line:0
 #: model:ir.model,name:account.model_account_analytic_line
 msgid "Analytic Line"
-msgstr ""
+msgstr "Analitička stavka"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models"
-msgstr ""
+msgstr "Modeli"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1124
@@ -6373,6 +6936,8 @@
 "You cannot cancel an invoice which is partially paid. You need to "
 "unreconcile related payment entries first."
 msgstr ""
+"Ne možete otkazati fakturu koja je djelomićno plaćena. Morate prvo otvoriti "
+"stavke zatvaranja."
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -6387,12 +6952,12 @@
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax_rate:0
 msgid "Sales Tax(%)"
-msgstr ""
+msgstr "Porez prodaje(%)"
 
 #. module: account
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr ""
+msgstr "Postavke izvještaja"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -6407,6 +6972,15 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite za unos povrata dobavljaču.\n"
+"              </p><p>\n"
+"               Umjesto ručnog kreiranja povrata dobavljaču, možete "
+"generisati\n"
+"                povrate i zatvarati ih direktno iz povezane fakture "
+"dobavljača.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.tax,type:0
@@ -6429,36 +7003,39 @@
 "choice assumes that the set of tax defined for the chosen template is "
 "complete"
 msgstr ""
+"Odaberite da li želite predložiti korisniku da unosi prodajni i nabavni "
+"porez ili koristi uobičajena m2o polja. Zadnji izbor pretpostavlja da je set "
+"poreza definisan u odabranom predlošku potpun."
 
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr ""
+msgstr "Prijava poreza"
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Kompanije"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
-msgstr ""
+msgstr "Otvorene i plaćene fakture"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "Display children flat"
-msgstr ""
+msgstr "Prikaži podređene bez grupisanja"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "Bank & Cash"
-msgstr ""
+msgstr "Banka i Gotovina"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
 msgid "Select a fiscal year to close"
-msgstr ""
+msgstr "Odaberite fiskalnu godinu za zatvaranje"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
@@ -6485,7 +7062,7 @@
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Partial Reconcile Entries"
-msgstr ""
+msgstr "Djelomično zatvorene stavke"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6537,13 +7114,14 @@
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "Ne možete kreirati stavke dnevnika na zatvorenom kontu."
 
 #. module: account
 #: code:addons/account/account_invoice.py:633
 #, python-format
 msgid "Invoice line account's company and invoice's compnay does not match."
 msgstr ""
+"Kompanija iz stavke dnevnika zapisa i kompanija iz fakture se ne poklapaju."
 
 #. module: account
 #: view:account.invoice:0
@@ -6558,13 +7136,13 @@
 #. module: account
 #: help:account.analytic.line,currency_id:0
 msgid "The related account currency if not equal to the company one."
-msgstr ""
+msgstr "Povezani konto valute ako nije jednak onom od kompanije."
 
 #. module: account
 #: code:addons/account/installer.py:69
 #, python-format
 msgid "Custom"
-msgstr ""
+msgstr "Prilagođeno"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -6574,7 +7152,7 @@
 #. module: account
 #: field:account.journal,cashbox_line_ids:0
 msgid "CashBox"
-msgstr ""
+msgstr "Blagajna"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_cash_equity
@@ -6585,13 +7163,13 @@
 #. module: account
 #: field:account.journal,internal_account_id:0
 msgid "Internal Transfers Account"
-msgstr ""
+msgstr "Konto internog prijenosa"
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:32
 #, python-format
 msgid "Please check that the field 'Journal' is set on the Bank Statement"
-msgstr ""
+msgstr "Molimo provjerite da je polje 'dnevnik' postavljeno na izvodu"
 
 #. module: account
 #: selection:account.tax,type:0
@@ -6601,12 +7179,12 @@
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round globally"
-msgstr ""
+msgstr "Zaokruži Globalno"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
 msgid "Journal & Partner"
-msgstr ""
+msgstr "Dnevnik i Partner"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
@@ -6617,9 +7195,17 @@
 #: code:addons/account/account.py:3465
 #, python-format
 msgid "Cannot generate an unused journal code."
-msgstr ""
-
-#. module: account
+msgstr "Nije moguće generisati nekorištenu šifru dnevnika."
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.invoice:0
+msgid "force period"
+msgstr "Prisili period"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
 msgstr "Pogledaj retke konta analitike"
@@ -6633,7 +7219,7 @@
 #. module: account
 #: field:account.bank.statement,difference:0
 msgid "Difference"
-msgstr ""
+msgstr "Razlika"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -6641,11 +7227,12 @@
 "Indicates if the amount of tax must be included in the base amount for the "
 "computation of the next taxes"
 msgstr ""
+"Iznos poreza treba uključiti u osnovicu prilikom izračuna sljedećih poreza."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr ""
+msgstr "Zatvaranje: Idi na sljedećeg partnera"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
@@ -6667,6 +7254,10 @@
 "due date, make sure that the payment term is not set on the invoice. If you "
 "keep the payment term and the due date empty, it means direct payment."
 msgstr ""
+"Ako koristiti uslove plaćanja, datum dospijeća će biti automatski izračunat "
+"u trenutku nastanka knjiženja. Uslovi plaćanja mogu računati nekoliko datuma "
+"dospijeća, npr. 50% odmah i 50% za mjesec dana, ali ako želite prisiliti "
+"datum dopsijeća, osigurajte da uslov plaćanja nije postavljen na fakturi."
 
 #. module: account
 #: code:addons/account/account.py:414
@@ -6675,6 +7266,8 @@
 "There is no opening/closing period defined, please create one to set the "
 "initial balance."
 msgstr ""
+"Nije definisan period početnog/završnog stanja. Molimo napravite jedan da bi "
+"postavili početni saldo."
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -6702,30 +7295,30 @@
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Greška Korisnika!"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Discard"
-msgstr ""
+msgstr "Odbaci"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: view:account.journal:0
 msgid "Liquidity"
-msgstr ""
+msgstr "Likvidnost"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr ""
+msgstr "Stavke analitičkog dnevnika"
 
 #. module: account
 #: field:account.config.settings,has_default_company:0
 msgid "Has default company"
-msgstr ""
+msgstr "Ima zadanu kompaniju"
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -6734,11 +7327,13 @@
 "year. Note that you can run this wizard many times for the same fiscal year: "
 "it will simply replace the old opening entries with the new ones."
 msgstr ""
+"Ovaj čarobnjak će kreirati dnevničke zapise početnog stanja u novoj godini. "
+"Najprije će obrisati postojeća knjiženja početnog stanja i kreirati novo."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
 msgid "Bank and Cash"
-msgstr ""
+msgstr "Banka i Blagajna"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -6748,16 +7343,20 @@
 "the tool search to analyse information about analytic entries generated in "
 "the system."
 msgstr ""
+"Iz ovog pogleda imate analizu vaših različitih analičkih unosa prateći "
+"analitički konto koji ste definisali prema vašim poslovnim potrebama. "
+"Koristite alat pretraživanja za analizu informacija o analitičkim unosima "
+"generisanim u sistemu."
 
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Naziv dnevnika mora biti jedinstven za jednu organizaciju!"
 
 #. module: account
 #: field:account.account.template,nocreate:0
 msgid "Optional create"
-msgstr ""
+msgstr "Opcionalno kreiranje"
 
 #. module: account
 #: code:addons/account/account.py:686
@@ -6766,6 +7365,8 @@
 "You cannot change the owner company of an account that already contains "
 "journal items."
 msgstr ""
+"Ne možete mijenjati kompaniju vlasnika na kontu koji već sadrži dnevničke "
+"zapise."
 
 #. module: account
 #: report:account.invoice:0
@@ -6808,7 +7409,7 @@
 #: view:account.tax.code.template:0
 #: view:analytic.entries.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiši po..."
 
 #. module: account
 #: code:addons/account/account.py:1024
@@ -6817,6 +7418,8 @@
 "There is no period defined for this date: %s.\n"
 "Please create one."
 msgstr ""
+"Za ovaj datum nije definisano razdoblje: %s.\n"
+"Molim Vas da ga kreirate."
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
@@ -6837,7 +7440,7 @@
 #. module: account
 #: field:account.installer,has_default_company:0
 msgid "Has Default Company"
-msgstr ""
+msgstr "Ima predefinisanu kompaniju"
 
 #. module: account
 #: model:ir.model,name:account.model_account_sequence_fiscalyear
@@ -6859,7 +7462,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "Reconciled"
-msgstr ""
+msgstr "Zatvoreno"
 
 #. module: account
 #: constraint:account.payment.term.line:0
@@ -6867,6 +7470,7 @@
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2%."
 msgstr ""
+"Postoci za stavke uslova plaćanja moraju biti između 0 i 1, npr. 0.02 za 2%."
 
 #. module: account
 #: report:account.invoice:0
@@ -6887,12 +7491,12 @@
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "Tax Name must be unique per company!"
-msgstr ""
+msgstr "Naziv poreza mora biti jedinstven unutar kompanije!"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cash Transactions"
-msgstr ""
+msgstr "Transakcije blagajne"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -6900,6 +7504,8 @@
 "If you unreconcile transactions, you must also verify all the actions that "
 "are linked to those transactions because they will not be disabled"
 msgstr ""
+"Ako razvežete transakcije, morate također verifikovati sve akcije povezane "
+"sa tim transakcijama jer one neće biti onemogućene."
 
 #. module: account
 #: view:account.account.template:0
@@ -6914,19 +7520,19 @@
 #. module: account
 #: model:ir.model,name:account.model_analytic_entries_report
 msgid "Analytic Entries Statistics"
-msgstr ""
+msgstr "Statistike analitike"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
 #: code:addons/account/account_move_line.py:955
 #, python-format
 msgid "Entries: "
-msgstr ""
+msgstr "Zapisi: "
 
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr ""
+msgstr "Valuta povezanog računovodstvenog dnevnika"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -6934,6 +7540,7 @@
 "You cannot provide a secondary currency if it is the same than the company "
 "one."
 msgstr ""
+"Ne možete odrediti sekundarnu valutu ako je ista kao i valuta kompanije."
 
 #. module: account
 #: selection:account.tax.template,applicable_type:0
@@ -6945,12 +7552,12 @@
 #: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
-msgstr ""
+msgstr "Bilans stanja (konto aktive)"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
 msgid "State is draft"
-msgstr ""
+msgstr "Stanje je 'U pripremi'"
 
 #. module: account
 #: view:account.move.line:0
@@ -6960,7 +7567,7 @@
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr ""
+msgstr "Sljedeća stavka za zatvaranje"
 
 #. module: account
 #: report:account.invoice:0
@@ -6990,7 +7597,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current period"
-msgstr ""
+msgstr "Stavke dnevnika sa razdobljem u trenutnom razdoblju"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6998,6 +7605,8 @@
 "Check this box if you want to allow the cancellation the entries related to "
 "this journal or of the invoice related to this journal"
 msgstr ""
+"Označite ako želite dopustiti naknadno otkazivanje proknjiženih (potvrđenih) "
+"dnevničkih zapisa ili računa ovog dnevnika."
 
 #. module: account
 #: view:account.fiscalyear.close:0
@@ -7010,39 +7619,47 @@
 msgstr "Kreiraj stavku"
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:account.open.closed.fiscalyear:0
+msgid "Cancel Fiscal Year Closing Entries"
+msgstr "Otkaži unose zatvaranja fiskalne godine"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr ""
+msgstr "Dobit i Gubitak (konto troška)"
 
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Total Transactions"
-msgstr ""
+msgstr "Ukupno transakcija"
 
 #. module: account
 #: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
-msgstr ""
+msgstr "Nije moguće pobrisati konto koji ima knjiženja (stavke u dnevniku)."
 
 #. module: account
 #: code:addons/account/account.py:1024
 #: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Greška !"
 
 #. module: account
 #: field:account.financial.report,style_overwrite:0
 msgid "Financial Report Style"
-msgstr ""
+msgstr "Stil financijskog izvještaja"
 
 #. module: account
 #: selection:account.financial.report,sign:0
 msgid "Preserve balance sign"
-msgstr ""
+msgstr "Zadrži predznak salda"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -7069,13 +7686,13 @@
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: create refund and reconcile"
-msgstr ""
+msgstr "Otkaži : kreiraj povrat i zatvori"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "You must set a start date."
-msgstr ""
+msgstr "Morate postaviti početni datum"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7086,12 +7703,16 @@
 "reconcile in a series of accounts. It finds entries for each partner where "
 "the amounts correspond."
 msgstr ""
+"Račun je plaćen kada su sve njegove stavke dugovanja kupca (ili potraživanja "
+"dobavljača) zatvorene protustavkama, najčešće plaćanjima banke, blagajne ili "
+"sl.  Funkcija automatskog zatvaranja za svakog partnera pronalazi stavke "
+"odgovarajućeg iznosa."
 
 #. module: account
 #: view:account.move:0
 #: field:account.move,to_check:0
 msgid "To Review"
-msgstr ""
+msgstr "Za provjeru"
 
 #. module: account
 #: help:account.partner.ledger,initial_balance:0
@@ -7101,6 +7722,9 @@
 "row to display the amount of debit/credit/balance that precedes the filter "
 "you've set."
 msgstr ""
+"Ako ste odabrali filter po datumu ili periodu, ovo polje će Vam omogućiti da "
+"dodate red za prikaz iznosa duguje/potražuje/saldo koje prethodi filteru "
+"koji ste postavili."
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7109,18 +7733,18 @@
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Journal Entries"
-msgstr ""
+msgstr "Dnevnički zapisi"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:147
 #, python-format
 msgid "No period found on the invoice."
-msgstr ""
+msgstr "Na računu nije pronađen period."
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
 msgid "Display Ledger Report with One partner per page"
-msgstr ""
+msgstr "Jedan partner po stranici"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -7160,12 +7784,12 @@
 #. module: account
 #: constraint:account.move.reconcile:0
 msgid "You can only reconcile journal items with the same partner."
-msgstr ""
+msgstr "Moguće je zatvoriti samo stavke istog partnera."
 
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr ""
+msgstr "Odabir dnevnika"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7173,7 +7797,7 @@
 #: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
-msgstr ""
+msgstr "Početni saldo"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
@@ -7183,7 +7807,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Position"
-msgstr ""
+msgstr "Fiskalna pozicija poreza"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -7198,7 +7822,7 @@
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 msgid "The payment order is sent to the bank."
-msgstr ""
+msgstr "Nalog za plaćanje je poslan u banku."
 
 #. module: account
 #: help:account.move,to_check:0
@@ -7206,19 +7830,21 @@
 "Check this box if you are unsure of that journal entry and if you want to "
 "note it as 'to be reviewed' by an accounting expert."
 msgstr ""
+"Označite \"za provjeru\" kada niste sigurni da li je knjiženje ispravno i "
+"kada je potrebno ekspertno mišljenje."
 
 #. module: account
 #: field:account.chart.template,complete_tax_set:0
 #: field:wizard.multi.charts.accounts,complete_tax_set:0
 msgid "Complete Set of Taxes"
-msgstr ""
+msgstr "Kompletan popis poreza"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:61
 #, python-format
 msgid ""
 "Selected Entry Lines does not have any account move enties in draft state."
-msgstr ""
+msgstr "Odabrane stavke nemaju knjiženja koja su u statusu u pripremi."
 
 #. module: account
 #: view:account.chart.template:0
@@ -7228,7 +7854,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_tax_chart
 msgid "Account tax chart"
-msgstr ""
+msgstr "Struktura poreza"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7248,6 +7874,8 @@
 "Configuration error!\n"
 "The currency chosen should be shared by the default accounts too."
 msgstr ""
+"Greška konfiguracije!\n"
+"Odabranu valutu je potrebno dijeliti i kod predodređenih konta."
 
 #. module: account
 #: code:addons/account/account.py:2304
@@ -7262,21 +7890,28 @@
 "\n"
 "e.g. My model on %(date)s"
 msgstr ""
+"Možete navesti godinu, mjesec i dan u nazivu modela pomoću ovih oznaka:\n"
+"\n"
+"%(year)s: za godinu \n"
+"%(month)s: za mjesec \n"
+"%(date)s: tenutni datum\n"
+"\n"
+"npr. Knjiženje troškova plate za %(month)s"
 
 #. module: account
 #: field:account.invoice,paypal_url:0
 msgid "Paypal Url"
-msgstr ""
+msgstr "Paypal Url"
 
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
-msgstr ""
+msgstr "Upravljanje plaćanjima kupaca"
 
 #. module: account
 #: help:report.invoice.created,origin:0
 msgid "Reference of the document that generated this invoice report."
-msgstr ""
+msgstr "Oznaka dokumenta koji je kreirao ovaj račun."
 
 #. module: account
 #: field:account.tax.code,child_ids:0
@@ -7290,13 +7925,23 @@
 "Error!\n"
 "The start date of a fiscal year must precede its end date."
 msgstr ""
+"Greška!\n"
+"Početni datum fiskalne godine mora biti prije završnog."
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Sales"
-msgstr ""
-
-#. module: account
+msgstr "Porezi prodaje"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.period:0
+msgid "Re-Open Period"
+msgstr "Ponovno otvaranje razdoblja"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
@@ -7305,12 +7950,12 @@
 #. module: account
 #: view:account.tax:0
 msgid "Misc"
-msgstr ""
+msgstr "Ostalo"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Sales"
-msgstr ""
+msgstr "Prodaje"
 
 #. module: account
 #: selection:account.invoice.report,state:0
@@ -7328,11 +7973,14 @@
 "Make sure you have configured payment terms properly.\n"
 "The latest payment term line should be of the \"Balance\" type."
 msgstr ""
+"Ne možete potvrditi unos koji nije u ravnoteži.\n"
+"Provjerite da li ste podesili uslove plaćanja kako treba.\n"
+"Zadnja linija načina plaćanja mora biti  tip \"saldo\"."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "Stavka izvoda sa ručnim unosom postaje stavka u pripremi."
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -7344,18 +7992,35 @@
 "you request an interval of 30 days OpenERP generates an analysis of "
 "creditors for the past month, past two months, and so on. "
 msgstr ""
+"Struktura dospjelih dugovanja/potraživanja partnera je detaljniji izvještaj "
+"o dugovanjima/potraživanjima u intervalima. Za zadani period i broj dana "
+"intervala analize OpenERP izračunava tabelu dugovanja po intervalu. Ako "
+"zadate interval od 30 dana analiza će pokazati dugovanja do 30, 30 do 60, 60 "
+"do 90 dana i tako dalje. "
 
 #. module: account
 #: field:account.invoice,origin:0
 #: field:account.invoice.line,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Izvorni dokument"
 
 #. module: account
+<<<<<<< TREE
 #: help:account.config.settings,company_footer:0
 msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
+=======
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr "Nije definiran konto troška za ovaj proizvod : \"%s\" (id:%d)"
+
+#. module: account
+#: view:account.account.template:0
+msgid "Internal notes..."
+msgstr "Interna bilješka ..."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: constraint:account.account:0
@@ -7364,16 +8029,18 @@
 "You cannot define children to an account with internal type different of "
 "\"View\"."
 msgstr ""
+"Greška prilikom konfiguracije!\n"
+"Nije moguće dodijeliti podkonta kontu koji nije 'Pogled'."
 
 #. module: account
 #: model:ir.model,name:account.model_accounting_report
 msgid "Accounting Report"
-msgstr ""
+msgstr "Računovodstveni izvještaj"
 
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account
 #: report:account.invoice:0
@@ -7392,16 +8059,18 @@
 #: help:account.tax,amount:0
 msgid "For taxes of type percentage, enter % ratio between 0-1."
 msgstr ""
+"Za poreze koji se računaju putem postotka upišite vrijednost između 0 i 1. "
+"Npr. 0,25 za 25%."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "Hijerarhija financijskog izvještaja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Mjesečni promet"
 
 #. module: account
 #: view:account.move:0
@@ -7423,7 +8092,7 @@
 #. module: account
 #: view:account.journal.select:0
 msgid "Are you sure you want to open Journal Entries?"
-msgstr ""
+msgstr "Potvrdite otvaranje stavki."
 
 #. module: account
 #: view:account.state.open:0
@@ -7433,12 +8102,12 @@
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr ""
+msgstr "Konto troška početnog stanja"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "Referenca kupca"
 
 #. module: account
 #: field:account.account.template,parent_id:0
@@ -7454,7 +8123,7 @@
 #: view:account.bank.statement:0
 #: field:account.bank.statement,closing_details_ids:0
 msgid "Closing Cashbox Lines"
-msgstr ""
+msgstr "Zatvaranje stavki blagajne"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7467,35 +8136,40 @@
 #. module: account
 #: help:account.journal,default_debit_account_id:0
 msgid "It acts as a default account for debit amount"
-msgstr ""
+msgstr "Uobičajeni konto za dugovni iznos"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr ""
+msgstr "Knjiženi zapisi"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
 msgid "For percent enter a ratio between 0-1."
-msgstr ""
+msgstr "Za postotak unesite omjer između 0 i 1"
 
 #. module: account
 #: report:account.invoice:0
 #: view:account.invoice:0
+<<<<<<< TREE
 #: field:account.invoice,date_invoice:0
 #: field:report.invoice.created,date_invoice:0
 msgid "Invoice Date"
 msgstr "Datum fakturiranja"
+=======
+msgid "Accounting Period"
+msgstr "Obračuski period"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Grupiraj po godini izdavanja računa"
 
 #. module: account
 #: field:account.config.settings,purchase_tax_rate:0
 msgid "Purchase tax (%)"
-msgstr ""
+msgstr "Porez nabavke (%)"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -7505,12 +8179,12 @@
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr ""
+msgstr "Stavke dnevnika koje nisu u ravnoteži"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_account_charts_modules
 msgid "Chart Templates"
-msgstr ""
+msgstr "Predlošci plana"
 
 #. module: account
 #: field:account.journal.period,icon:0
@@ -7541,7 +8215,7 @@
 #. module: account
 #: field:account.bank.statement,closing_date:0
 msgid "Closed On"
-msgstr ""
+msgstr "Zatvoren"
 
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
@@ -7551,17 +8225,17 @@
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr ""
+msgstr "Uobičajen porez nabavke"
 
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
 msgid "Opening Entries Income Account"
-msgstr ""
+msgstr "Konto prihoda za početno stanje"
 
 #. module: account
 #: field:account.config.settings,group_proforma_invoices:0
 msgid "Allow pro-forma invoices"
-msgstr ""
+msgstr "Odobri ProForma fakture"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7597,12 +8271,12 @@
 #. module: account
 #: model:ir.model,name:account.model_cash_box_out
 msgid "cash.box.out"
-msgstr ""
+msgstr "cash.box.out"
 
 #. module: account
 #: help:account.config.settings,currency_id:0
 msgid "Main currency of the company."
-msgstr ""
+msgstr "Glavna valuta kompanije"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reports
@@ -7615,12 +8289,12 @@
 #: code:addons/account/static/src/js/account_move_reconciliation.js:90
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Upozorenje"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_analytic_open
 msgid "Contracts/Analytic Accounts"
-msgstr ""
+msgstr "Ugovori/analitička konta"
 
 #. module: account
 #: view:account.journal:0
@@ -7631,7 +8305,7 @@
 #. module: account
 #: field:account.config.settings,tax_calculation_rounding_method:0
 msgid "Tax calculation rounding method"
-msgstr ""
+msgstr "Metoda zaokruživanja kod izračuna poreza"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
@@ -7648,6 +8322,11 @@
 "                                    with the invoice. You will not be able "
 "to modify the credit note."
 msgstr ""
+"Koristite ovu opciju ako želite stornirati račun.\n"
+"                                    Kreirati će se novi storno dokument koji "
+"će zatvoriti ovaj \n"
+"                                    račun. Stornirani dokument ne možete "
+"modificirati."
 
 #. module: account
 #: help:account.partner.reconcile.process,next_partner_id:0
@@ -7656,11 +8335,13 @@
 "the system to go through the reconciliation process, based on the latest day "
 "it have been reconciled."
 msgstr ""
+"Pokazuje sljedećeg partnera u procesu zatvaranja IOS-a, a prema zadnjem danu "
+"zatvaranja IOS-a."
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
 msgid "Comment"
-msgstr ""
+msgstr "Komentar"
 
 #. module: account
 #: field:account.tax,domain:0
@@ -7671,7 +8352,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_use_model
 msgid "Use model"
-msgstr ""
+msgstr "Koristi model"
 
 #. module: account
 #: code:addons/account/account.py:1490
@@ -7680,6 +8361,8 @@
 "There is no default credit account defined \n"
 "on journal \"%s\"."
 msgstr ""
+"Ne postoji predefinirani potražni konto \n"
+"za dnevnik \"%s\"."
 
 #. module: account
 #: view:account.invoice.line:0
@@ -7691,7 +8374,7 @@
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr ""
+msgstr "Povrati kupaca i dobavljača"
 
 #. module: account
 #: field:account.financial.report,sign:0
@@ -7718,11 +8401,24 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Pritisnite za kreiranje novog analitičkog konta..\n"
+"              </p><p>\n"
+"                Standardno je struktura kontnog plana definisana zakonskim\n"
+"                propisima svake zemlje. Struktura analitičkih konta\n"
+"                bi trebala odgovarati potrebama vaše kompanije.\n"
+"              </p><p>\n"
+"                Većina poslovnih promjena u OpenERP-u (fakturisanje,\n"
+"                troškovi, nabavka, proizvodnja ...) generišu analitičke "
+"stavke\n"
+"                na povezanom kontu.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
 msgid "Root/View"
-msgstr ""
+msgstr "Izvorni/Pogled"
 
 #. module: account
 #: code:addons/account/account.py:3206
@@ -7741,7 +8437,7 @@
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr ""
+msgstr "Nije izravnat"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -7752,7 +8448,7 @@
 #: model:ir.actions.act_window,name:account.action_email_templates
 #: model:ir.ui.menu,name:account.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "Predlozi email-a"
 
 #. module: account
 #: view:account.move.line:0
@@ -7780,22 +8476,23 @@
 "This field is used for payable and receivable journal entries. You can put "
 "the limit date for the payment of this line."
 msgstr ""
+"Koristi se za salda konti kupaca i dobavljača. Upišite datum valute plaćanja."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
 msgid "Multi-Currencies"
-msgstr ""
+msgstr "Višestruke valute"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Datum dospijeća"
 
 #. module: account
 #: code:addons/account/account.py:3193
 #, python-format
 msgid "Sales Journal"
-msgstr ""
+msgstr "Dnevnik prodaje"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
@@ -7806,13 +8503,13 @@
 #: code:addons/account/account_move_line.py:1185
 #, python-format
 msgid "No piece number !"
-msgstr ""
+msgstr "Ne postoji broj dijela !"
 
 #. module: account
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "Hijerarhija računovodstvenih izvještaja"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7823,11 +8520,16 @@
 "few new accounts (You don't need to define the whole structure that is "
 "common to both several times)."
 msgstr ""
+"Ova opcionalno polje Vam omogućava da povežete predložak konta na određeni "
+"predložak kontnog plana koji se mogu razlikovati od onog kojem njegov "
+"nadređeni pripada. To Vam omogućava da definišete predloške koji  proširuju "
+"druge i upotpunjuju ih sa par novih konta (ne morate definisati cijelu "
+"strukturu koja je zajednička za oba nekoliko puta)."
 
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr ""
+msgstr "Neknjiženi dnevnički zapisi"
 
 #. module: account
 #: help:account.invoice.refund,date:0
@@ -7835,6 +8537,8 @@
 "This date will be used as the invoice date for credit note and period will "
 "be chosen accordingly!"
 msgstr ""
+"Ovaj će se datum koristiti kao datum fakture za odobrenja i razdoblje će "
+"biti odabrano skladno tome."
 
 #. module: account
 #: view:product.template:0
@@ -7848,11 +8552,12 @@
 "You have to set a code for the bank account defined on the selected chart of "
 "accounts."
 msgstr ""
+"Morate odrediti šifru za bankovni račun definisan na odabranom kontnom planu."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
 msgid "Manual Reconciliation"
-msgstr ""
+msgstr "Ručno zatvaranje"
 
 #. module: account
 #: report:account.overdue:0
@@ -7870,7 +8575,7 @@
 #: code:addons/account/account.py:1541
 #, python-format
 msgid "Currency Adjustment"
-msgstr ""
+msgstr "Podešavanje valuta"
 
 #. module: account
 #: field:account.fiscalyear.close,fy_id:0
@@ -7881,13 +8586,14 @@
 #: view:account.invoice.cancel:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_cancel
 msgid "Cancel Selected Invoices"
-msgstr ""
+msgstr "Otkaži odabrane fakture"
 
 #. module: account
 #: help:account.account.type,report_type:0
 msgid ""
 "This field is used to generate legal reports: profit and loss, balance sheet."
 msgstr ""
+"Ovo se polje koristi za generisanje izvještaja: dobitak i gubitak, bilans"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -7896,13 +8602,13 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: account
 #: code:addons/account/account_invoice.py:820
 #, python-format
 msgid "Global taxes defined, but they are not in invoice lines !"
-msgstr ""
+msgstr "Globalno su definirani porezi ali se ne nalaze na stavkama faktura!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
@@ -7915,16 +8621,17 @@
 "The sequence field is used to order the resources from lower sequences to "
 "higher ones."
 msgstr ""
+"Polje sekvenca se koristi za redosljed resursa od niže sekvence prema višima."
 
 #. module: account
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount in Currency"
-msgstr ""
+msgstr "Ostatak iznosa u valuti"
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
 msgid "Credit note sequence"
-msgstr ""
+msgstr "Sekvenca odobrenja"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move
@@ -7933,7 +8640,7 @@
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr ""
+msgstr "Knjiži dnevničke zapise"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -7948,7 +8655,7 @@
 #. module: account
 #: field:account.financial.report,name:0
 msgid "Report Name"
-msgstr ""
+msgstr "Naziv izvještaja"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_cash
@@ -7973,6 +8680,8 @@
 "Refund base on this type. You can not Modify and Cancel if the invoice is "
 "already reconciled"
 msgstr ""
+"Povrat baziran na ovom tipu. Ne možete mijenjati i otkazati ako je faktura "
+"već zatvorena."
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -7990,17 +8699,17 @@
 #. module: account
 #: field:account.config.settings,paypal_account:0
 msgid "Paypal account"
-msgstr ""
+msgstr "Paypal račun"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
-msgstr ""
+msgstr "Broj dnevničkih zapisa"
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Parent Report"
-msgstr ""
+msgstr "Nadređeni izvještaj"
 
 #. module: account
 #: constraint:account.account:0
@@ -8009,27 +8718,29 @@
 "Error!\n"
 "You cannot create recursive accounts."
 msgstr ""
+"Greška!\n"
+"Ne možete kreirati rekurzivna konta."
 
 #. module: account
 #: model:ir.model,name:account.model_cash_box_in
 msgid "cash.box.in"
-msgstr ""
+msgstr "cash.box.in"
 
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr ""
+msgstr "Poveznica na automatski kreirane stavke dnevnika"
 
 #. module: account
 #: model:ir.model,name:account.model_account_config_settings
 msgid "account.config.settings"
-msgstr ""
+msgstr "account.config.settings"
 
 #. module: account
 #: selection:account.config.settings,period:0
 #: selection:account.installer,period:0
 msgid "Monthly"
-msgstr ""
+msgstr "Mjesečno"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_asset
@@ -8039,14 +8750,14 @@
 #. module: account
 #: field:account.bank.statement,balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "Izračunati saldo"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/js/account_move_reconciliation.js:89
 #, python-format
 msgid "You must choose at least one record."
-msgstr ""
+msgstr "Morate izabrati barem jedan zapis"
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -8058,7 +8769,7 @@
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Profit"
-msgstr ""
+msgstr "Dobit"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -8077,9 +8788,22 @@
 msgstr "Transakcije za usklađivanje"
 
 #. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:472
+#, python-format
+msgid ""
+"You cannot delete an invoice which is not draft or cancelled. You should "
+"refund it instead."
+msgstr ""
+"Nije moguće pobrisati fakture koji nisu u statusu u pripremi ili otkazan. "
+"Možete ga samo stornirati."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Reports"
-msgstr ""
+msgstr "Zakonski izvještaji"
 
 #. module: account
 #: field:account.tax.code,sum_period:0
@@ -8100,12 +8824,12 @@
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr ""
+msgstr "Stavka blagajne"
 
 #. module: account
 #: field:account.installer,charts:0
 msgid "Accounting Package"
-msgstr ""
+msgstr "Knjigovodstveni paket"
 
 #. module: account
 #: report:account.third_party_ledger:0
@@ -8129,28 +8853,28 @@
 #: code:addons/account/account.py:1031
 #, python-format
 msgid "Warning !"
-msgstr ""
+msgstr "Upozorenje !"
 
 #. module: account
 #: help:account.bank.statement,message_unread:0
 #: help:account.invoice,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Ako je označeno, nove poruke će zahtjevati vašu pažnju."
 
 #. module: account
 #: field:res.company,tax_calculation_rounding_method:0
 msgid "Tax Calculation Rounding Method"
-msgstr ""
+msgstr "Metoda zaokruživanja prilikom izračuna poreza"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr ""
+msgstr "Stanje stavke"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
 msgid "Account move line reconcile"
-msgstr ""
+msgstr "Zatvaranje stavke dnevničkog zapisa"
 
 #. module: account
 #: view:account.subscription.generate:0
@@ -8161,7 +8885,7 @@
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open for Unreconciliation"
-msgstr ""
+msgstr "Otvori za otvaranje"
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
@@ -8191,18 +8915,18 @@
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr ""
+msgstr "Odaberite valutu fakture"
 
 #. module: account
 #: code:addons/account/account_invoice.py:901
 #, python-format
 msgid "No Invoice Lines !"
-msgstr ""
+msgstr "Nema stavaka faktura!"
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Report Type"
-msgstr ""
+msgstr "Tip izvještaja"
 
 #. module: account
 #: help:account.open.closed.fiscalyear,fyear_id:0
@@ -8210,6 +8934,8 @@
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
 msgstr ""
+"Odaberi fiskalnu godinu za koju želite ukoliniti dnevičke zapise za kraj "
+"godine."
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -8223,12 +8949,14 @@
 "The statement balance is incorrect !\n"
 "The expected balance (%.2f) is different than the computed one. (%.2f)"
 msgstr ""
+"Saldo izvoda je neispravan !\n"
+"Očekivani saldo (%.2f) je različit od izračunatog. (%.2f)"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:420
 #, python-format
 msgid "The account entries lines are not in valid state."
-msgstr ""
+msgstr "Stavke zapisa ovog konta su neispravne"
 
 #. module: account
 #: field:account.account.type,close_method:0
@@ -8238,13 +8966,14 @@
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Automatic entry"
-msgstr ""
+msgstr "Automatski zapis"
 
 #. module: account
 #: help:account.account,reconcile:0
 msgid ""
 "Check this box if this account allows reconciliation of journal items."
 msgstr ""
+"Označite ovu stavku ako ovaj konto dozvoljava zatvaranje stavaki dnevnika"
 
 #. module: account
 #: report:account.analytic.account.inverted.balance:0
@@ -8255,7 +8984,7 @@
 #: help:account.move.reconcile,opening_reconciliation:0
 msgid ""
 "Is this reconciliation produced by the opening of a new fiscal year ?."
-msgstr ""
+msgstr "Da li je ovo zatvaranje proizvod otvaranja nove fiskalne godine ?"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -8272,7 +9001,7 @@
 #: code:addons/account/account_invoice.py:1465
 #, python-format
 msgid "You must first select a partner !"
-msgstr ""
+msgstr "Morate prvo odabrati partnera !"
 
 #. module: account
 #: field:account.invoice,comment:0
@@ -8283,18 +9012,18 @@
 #: field:account.invoice.report,residual:0
 #: field:account.invoice.report,user_currency_residual:0
 msgid "Total Residual"
-msgstr ""
+msgstr "Uk. ostatak"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Opening Cash Control"
-msgstr ""
+msgstr "Kontrola početnog stanja blagajne"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Invoice's state is Open"
-msgstr ""
+msgstr "Stanje fakture je 'Otvoren'"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8328,17 +9057,17 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "No Fiscal Year Defined for This Company"
-msgstr ""
+msgstr "Nema definisane fiskalne godine za ovu kompaniju"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma"
-msgstr ""
+msgstr "Proforma"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "J.C. /Move name"
-msgstr ""
+msgstr "Naziv dnevničkog zapisa"
 
 #. module: account
 #: help:account.tax.template,include_base_amount:0
@@ -8353,28 +9082,29 @@
 #: code:addons/account/account.py:3196
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr ""
+msgstr "Dnevnik povrata dobavljača"
 
 #. module: account
 #: code:addons/account/account.py:1333
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "Molimo definišite sekvencu na dnevniku."
 
 #. module: account
 #: help:account.tax.template,amount:0
 msgid "For Tax Type percent enter % ratio between 0-1."
 msgstr ""
+"Za poreze tipa postotak upišite omjer između 0 i 1. Npr. 0,23 za 23 %."
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Current Accounts"
-msgstr ""
+msgstr "Trenutna konta"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "Grupiši po datumu računa"
 
 #. module: account
 #: help:account.journal,user_id:0
@@ -8388,6 +9118,9 @@
 "recalls.\n"
 "                This installs the module account_followup."
 msgstr ""
+"Ovo omogućuje automatizaciju dopisa za neplaćene račune, sa opozivima na "
+"više razina.\n"
+"                Instalira modul account_followup."
 
 #. module: account
 #: field:account.automatic.reconcile,period_id:0
@@ -8420,6 +9153,8 @@
 "Total amount (in Company currency) for transactions held in secondary "
 "currency for this account."
 msgstr ""
+"Ukupni iznos (u valuti kompanije) za transakcije izvršene u sekundarnoj "
+"valuti za ovaj konto."
 
 #. module: account
 #: report:account.invoice:0
@@ -8430,17 +9165,17 @@
 #: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
-msgstr ""
+msgstr "Odaberite početni i završni period"
 
 #. module: account
 #: field:account.config.settings,sale_sequence_next:0
 msgid "Next invoice number"
-msgstr ""
+msgstr "Sljedeći broj računa"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr ""
+msgstr "Generički izvještaji"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
@@ -8455,7 +9190,7 @@
 #. module: account
 #: field:account.account,adjusted_balance:0
 msgid "Adjusted Balance"
-msgstr ""
+msgstr "Prilagođeni saldo"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -8466,7 +9201,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "Int.Type"
-msgstr ""
+msgstr "Int.tip"
 
 #. module: account
 #: field:account.move.line,tax_amount:0
@@ -8479,6 +9214,8 @@
 "This wizard will remove the end of year journal entries of selected fiscal "
 "year. Note that you can run this wizard many times for the same fiscal year."
 msgstr ""
+"Ovaj čarobnjak pomaže u micanju stavaka zatvaranja odabrane fiskalne godine. "
+"Ovaj je čarobnjak moguće koristiti više puta za istu fiskalnu godinu."
 
 #. module: account
 #: report:account.invoice:0
@@ -8507,13 +9244,13 @@
 #: field:account.vat.declaration,chart_account_id:0
 #: field:accounting.report,chart_account_id:0
 msgid "Chart of Account"
-msgstr ""
+msgstr "Kontni plan"
 
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 msgid "Payment"
-msgstr ""
+msgstr "Plaćanje"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8529,7 +9266,7 @@
 #. module: account
 #: field:account.journal,centralisation:0
 msgid "Centralized Counterpart"
-msgstr ""
+msgstr "Centralizirana protustavka"
 
 #. module: account
 #: help:account.move.line,blocked:0
@@ -8537,6 +9274,8 @@
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
 msgstr ""
+"Možete označiti ovaj okvir kako bi obilježili  stavku dnevničkog zapisa kao "
+"poveznicu s pripadajućim partnerom."
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
@@ -8547,12 +9286,12 @@
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
 msgid "Account Analytic Inverted Balance"
-msgstr ""
+msgstr "Obrnuti saldo analitičkog konta"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_report
 msgid "Account Common Report"
-msgstr ""
+msgstr "Računovodstveni izvještaji"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -8564,11 +9303,18 @@
 "invoice will be created \n"
 "                                    so that you can edit it."
 msgstr ""
+"Koristite ovu opciju ako želite stornirati račun i kreirati novi u istom "
+"koraku.\n"
+"                                    Kreirati će se novi storno dokument koji "
+"će zatvoriti ovaj \n"
+"                                    račun, te novi račun u statusu 'U "
+"pripremi' kojega možete  \n"
+"                                    urediti."
 
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
-msgstr ""
+msgstr "Automatski uvoz bankovnih izvoda"
 
 #. module: account
 #: code:addons/account/account_invoice.py:381
@@ -8579,12 +9325,12 @@
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
 msgid "Move bank reconcile"
-msgstr ""
+msgstr "Zatvaranje bankovnog kretanja"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Primijeni"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
@@ -8596,7 +9342,7 @@
 #. module: account
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
-msgstr ""
+msgstr "${object.company_id.name} Faktura (Ref ${object.number or 'n/a'})"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1210
@@ -8605,11 +9351,13 @@
 "You cannot use this general account in this journal, check the tab 'Entry "
 "Controls' on the related journal."
 msgstr ""
+"Ne možete koristiti ovaj opšti konto u ovom dnevniku. Provjerite tab "
+"'kontola unosa' na povezanom dnevniku."
 
 #. module: account
 #: field:account.account.type,report_type:0
 msgid "P&L / BS Category"
-msgstr ""
+msgstr "Dobit i Gubitak / Bilans"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -8640,6 +9388,12 @@
 "You should press this button to re-open it and let it continue its normal "
 "process after having resolved the eventual exceptions it may have created."
 msgstr ""
+"Ovo se dugme pojavljuje samo kada je stanje fakture 'plaćeno' (pokazujući da "
+"je u potpunosti zatvoreno) i opcija automatskog izračuna 'zatvaranja' je "
+"ugašena (opisujući da to više nije slučaj). Drugim riječima, račun je "
+"razvezan i ne odgovara više stanju 'plaćen'. Trebali bi pritisnuti ovo dugme "
+"da bi ga ponovo otvorili i pustiti da nastavi sa normalnim procesom nakon "
+"što se razriješe eventualne iznimke koje bi mogle nastati."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_journal_form
@@ -8659,11 +9413,24 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Pritisnite za kreiranje dnevnika.\n"
+"              </p><p>\n"
+"                Dnevnik je nosioc poslovnih promjena nastalih u \n"
+"                svakodnevnom računovodstvenom poslovanju.\n"
+"              </p><p>\n"
+"                U praksi se obično koristi po jedan dnevnik za svaki način "
+"plaćanja\n"
+"                (gotovina, transakcijski račun, čekovi), jedan dnevnik "
+"nabave, nekoliko \n"
+"                dnevnika prodaje te jedan opšti za razne potrebe.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr ""
+msgstr "Završno knjiženje fiskalne godine"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
@@ -8678,7 +9445,7 @@
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
-msgstr ""
+msgstr "Filtriraj po"
 
 #. module: account
 #: code:addons/account/wizard/account_period_close.py:51
@@ -8686,13 +9453,15 @@
 msgid ""
 "In order to close a period, you must first post related journal entries."
 msgstr ""
+"Da bi zatvorili period, morate prvo proknjižiti dnevničke zapise iz tog "
+"perioda."
 
 #. module: account
 #: view:account.entries.report:0
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_company_analysis_tree
 msgid "Company Analysis"
-msgstr ""
+msgstr "Analiza organizacije"
 
 #. module: account
 #: help:account.invoice,account_id:0
@@ -8703,7 +9472,7 @@
 #: code:addons/account/account.py:3391
 #, python-format
 msgid "Tax %.2f%%"
-msgstr ""
+msgstr "Porez %.2f%%"
 
 #. module: account
 #: field:account.tax.code,parent_id:0
@@ -8721,22 +9490,22 @@
 #: code:addons/account/account.py:3194
 #, python-format
 msgid "Purchase Journal"
-msgstr ""
+msgstr "Dnevnik nabavke"
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Sub-ukupno"
 
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr ""
+msgstr "Ispis poreske prijave"
 
 #. module: account
 #: view:account.model.line:0
 msgid "Journal Entry Model Line"
-msgstr ""
+msgstr "Stavka modela dnevničkih zapisa"
 
 #. module: account
 #: view:account.invoice:0
@@ -8751,7 +9520,7 @@
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr ""
+msgstr "Dobavljači"
 
 #. module: account
 #: view:account.journal:0
@@ -8759,16 +9528,24 @@
 msgstr "Dozvoljene vrste računa (prazno za bez kontrole)"
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:account.payment.term:0
+msgid "Payment term explanation for the customer..."
+msgstr "Opis uslova plaćanja za kupca..."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.move.line,amount_residual:0
 msgid ""
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in the company currency."
-msgstr ""
+msgstr "Ostatak iznosa dugovanja ili potraživanja u valuti kompanije."
 
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr ""
+msgstr "Statistika"
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
@@ -8783,28 +9560,33 @@
 "computed. Because it is space consuming, we do not allow to use it while "
 "doing a comparison."
 msgstr ""
+"Ova Vam opcija omogućava da dobijete više detalja o načinu na koji se vaša "
+"salda računaju. Pošto zauzima dosta prostora, ne dozvoljavamo njihovo "
+"korištenje kod poređenja."
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
 msgid "Fiscalyear Close"
-msgstr ""
+msgstr "Fiskalna godina zatvorena"
 
 #. module: account
 #: sql_constraint:account.account:0
 msgid "The code of the account must be unique per company !"
-msgstr ""
+msgstr "Šifra konta mora biti jedinstvena za jednu kompaniju!"
 
 #. 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 ""
+"Ovaj modul će se koristiti za vrednovanje izlaznog skladišnog prometa "
+"koristeći nabavnu cijenu."
 
 #. module: account
 #: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
-msgstr ""
+msgstr "Neplaćene Fakture"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
@@ -8836,14 +9618,14 @@
 #. module: account
 #: field:account.config.settings,sale_tax_rate:0
 msgid "Sales tax (%)"
-msgstr ""
+msgstr "Porez prodaje (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
 #: model:ir.actions.act_window,name:account.action_account_analytic_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Chart of Analytic Accounts"
-msgstr ""
+msgstr "Analitički kontni plan"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -8861,12 +9643,23 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Pritisnite za kreiranje nove ponavljajuće stavke.\n"
+"              </p><p>\n"
+"                Ponavljajuća stavka je stavka koja već postoji u sistemu ali "
+"se ponavlja\n"
+"                određenog datuma, npr. povezana je uz potpisani ugovor ili "
+"dogovor sa\n"
+"                kupcem ili dobavljačem. Takve je unose moguće automatizovati "
+"u sistemu.\n"
+"                </p>\n"
+"            "
 
 #. module: account
 #: view:account.journal:0
 #: model:ir.ui.menu,name:account.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Dodatna podešavanja"
 
 #. module: account
 #: help:res.partner,debit:0
@@ -8877,7 +9670,7 @@
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr ""
+msgstr "Analitički troškovi"
 
 #. module: account
 #: field:account.analytic.journal,name:0
@@ -8890,12 +9683,12 @@
 #: code:addons/account/account_move_line.py:829
 #, python-format
 msgid "Entry \"%s\" is not valid !"
-msgstr ""
+msgstr "Stavka \"%s\" nije ispravna !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Smallest Text"
-msgstr ""
+msgstr "Najmanji tekst"
 
 #. module: account
 #: help:account.config.settings,module_account_check_writing:0
@@ -8903,11 +9696,13 @@
 "This allows you to check writing and printing.\n"
 "                This installs the module account_check_writing."
 msgstr ""
+"Ovo omogućava pisanja i štampanje čekova.\n"
+"                Instalira modul account_check_writing."
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
 msgid "Invoicing & Payments"
-msgstr ""
+msgstr "Fakturisanje i Plaćanja"
 
 #. module: account
 #: help:account.invoice,internal_number:0
@@ -8926,7 +9721,7 @@
 #. module: account
 #: help:account.chart,fiscalyear:0
 msgid "Keep empty for all open fiscal years"
-msgstr ""
+msgstr "Prazno za sve otvorene fiskalne godine"
 
 #. module: account
 #: help:account.move.line,amount_currency:0
@@ -8939,7 +9734,7 @@
 #: code:addons/account/account_move_line.py:1006
 #, python-format
 msgid "The account move (%s) for centralisation has been confirmed."
-msgstr ""
+msgstr "Temeljnica (%s) za centralizaciju je potvrđena."
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -8978,17 +9773,19 @@
 "created. If you leave that field empty, it will use the same journal as the "
 "current invoice."
 msgstr ""
+"Možete odabrati dnevnik za odobrenja koja će se kreirati. Ako ostavite polje "
+"prazno koristiti će se isti dnevnik kao i za trenutnu fakturu."
 
 #. module: account
 #: help:account.bank.statement.line,sequence:0
 msgid ""
 "Gives the sequence order when displaying a list of bank statement lines."
-msgstr ""
+msgstr "Daje redoslijed kod prikaza liste stavaka izvoda."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
-msgstr ""
+msgstr "Knjigovođa potvrđuje temeljnicu nastalu potvrdom fakture."
 
 #. module: account
 #: view:account.entries.report:0
@@ -9000,13 +9797,13 @@
 #: code:addons/account/account.py:2334
 #, python-format
 msgid "Wrong model !"
-msgstr ""
+msgstr "Pogrešan model!"
 
 #. module: account
 #: view:account.tax.code.template:0
 #: view:account.tax.template:0
 msgid "Tax Template"
-msgstr ""
+msgstr "Predložak poreza"
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -9016,7 +9813,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr ""
+msgstr "Ispis salda partnera"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1121
@@ -9026,6 +9823,9 @@
 "some non legal fields or you must unreconcile first.\n"
 "%s."
 msgstr ""
+"Ne možete vršiti ovu modifikaciju na zatvorenoj stavci. Možete samo "
+"mijenjati neka nevažna polja ili morate razvezati stavke.\n"
+"%s."
 
 #. module: account
 #: help:account.financial.report,sign:0
@@ -9036,11 +9836,16 @@
 "accounts that are typically more credited than debited and that you would "
 "like to print as positive amounts in your reports; e.g.: Income account."
 msgstr ""
+"Za konta koja su tipično više dugovna nego potražna i koja bi željeli "
+"ispisati kao negativne iznose u vašim izvještajima, trebate obrnuti predznak "
+"salda; npr. konta troška. Isto se odnosi na konta koja su tipično više "
+"potražna nego dugovna i koja bi htjeli da ispisuje kao pozitivne iznose u "
+"vašim izvještajima; npr. konta prihoda."
 
 #. module: account
 #: field:res.partner,contract_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Ugovori"
 
 #. module: account
 #: field:account.cashbox.line,bank_statement_id:0
@@ -9049,7 +9854,7 @@
 #: field:account.financial.report,credit:0
 #: field:account.financial.report,debit:0
 msgid "unknown"
-msgstr ""
+msgstr "nepoznato"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
@@ -9061,20 +9866,20 @@
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
 msgid "Draft invoices are checked, validated and printed."
-msgstr ""
+msgstr "Fakture u pripremi se provjeravaju, odobravaju i ispisuju."
 
 #. module: account
 #: field:account.bank.statement,message_is_follower:0
 #: field:account.invoice,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Je pratilac"
 
 #. module: account
 #: view:account.move:0
 #: field:account.move,narration:0
 #: field:account.move.line,narration:0
 msgid "Internal Note"
-msgstr ""
+msgstr "Interna bilješka"
 
 #. module: account
 #: constraint:account.account:0
@@ -9083,11 +9888,14 @@
 "You cannot select an account type with a deferral method different of "
 "\"Unreconciled\" for accounts with internal type \"Payable/Receivable\"."
 msgstr ""
+"Greška konfiguracije!\n"
+"Ne možete odabrati tip konta sa metodom odgode različitom od \"nezatvoreno\" "
+"za konta sa internim tipom \"obveze/potraživanja\"."
 
 #. module: account
 #: field:account.config.settings,has_fiscal_year:0
 msgid "Company has a fiscal year"
-msgstr ""
+msgstr "Organizacija ima fiskalnu godinu"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -9103,12 +9911,12 @@
 #: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
-msgstr ""
+msgstr "Nije moguće deaktivirati konto koji ima knjiženja."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Given by Python Code"
-msgstr ""
+msgstr "Pytkon programski kod"
 
 #. module: account
 #: field:account.analytic.journal,code:0
@@ -9119,7 +9927,7 @@
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
 msgid "Residual Amount"
-msgstr ""
+msgstr "Preostali iznos"
 
 #. module: account
 #: field:account.invoice,move_lines:0
@@ -9147,13 +9955,13 @@
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Unit of Currency"
-msgstr ""
+msgstr "Jedinica valute"
 
 #. module: account
 #: code:addons/account/account.py:3195
 #, python-format
 msgid "Sales Refund Journal"
-msgstr ""
+msgstr "Dnevnik povrata kupcima"
 
 #. module: account
 #: view:account.move:0
@@ -9170,26 +9978,30 @@
 "chart\n"
 "                        of accounts."
 msgstr ""
+"Nakon potvrđivanja fakture u statusu 'U pripremi' nećete ih više moći\n"
+"                        uređivati. Fakture će dobiti jedinstveni broj te će "
+"se \n"
+"                        kreirati stavke u knjiženja."
 
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
 msgid "Registered payment"
-msgstr ""
+msgstr "Registrovana plaćanja"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr ""
+msgstr "Fiskalne godine i periodi u stanju zatvoreno"
 
 #. module: account
 #: field:account.config.settings,purchase_refund_journal_id:0
 msgid "Purchase refund journal"
-msgstr ""
+msgstr "Dnevnik povrata dobavljaču"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Product Information"
-msgstr ""
+msgstr "Proizvod"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9208,18 +10020,18 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Configure Accounting Data"
-msgstr ""
+msgstr "Konfiguracija računovodstvenih podataka"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax_rate:0
 msgid "Purchase Tax(%)"
-msgstr ""
+msgstr "Porez nabave(%)"
 
 #. module: account
 #: code:addons/account/account_invoice.py:901
 #, python-format
 msgid "Please create some invoice lines."
-msgstr ""
+msgstr "Molimo upišite stavke fakture."
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:36
@@ -9228,11 +10040,13 @@
 "Please check that the field 'Internal Transfers Account' is set on the "
 "payment method '%s'."
 msgstr ""
+"Molimo provjerite da li je polje 'Konto internih prijenosa' postavljen na "
+"načinu plaćanja '%s'."
 
 #. module: account
 #: field:account.vat.declaration,display_detail:0
 msgid "Display Detail"
-msgstr ""
+msgstr "Prikaži detalje"
 
 #. module: account
 #: code:addons/account/account.py:3203
@@ -9246,12 +10060,14 @@
 "Analytic costs (timesheets, some purchased products, ...) come from analytic "
 "accounts. These generate draft invoices."
 msgstr ""
+"Analitički troškovi (ev. rada, nabava, ...) dolaze sa analitičkih "
+"konta(računa). Oni mogu kreirati fakture u pripremi."
 
 #. module: account
 #: view:account.analytic.line:0
 #: view:analytic.entries.report:0
 msgid "My Entries"
-msgstr ""
+msgstr "Moje stavke"
 
 #. module: account
 #: help:account.invoice,state:0
@@ -9266,6 +10082,12 @@
 "related journal entries may or may not be reconciled.             \n"
 "* The 'Cancelled' status is used when user cancel invoice."
 msgstr ""
+" * 'U pripremi' je status za nepotvrđeni faktura.             \n"
+"* 'Pro-forma' je status kada faktura još nije dobila broj.             \n"
+"* 'Otvoreno' je status kada je faktura kreirana i dobila je broj. Status "
+"'Otvoreno' znači da faktura nije plaćena.             \n"
+"* 'Plaćeno' je status koji faktura dobiva kada je plaćena.             \n"
+"* 'Otkazano' je status kada korisnik otkaže fakturu."
 
 #. module: account
 #: field:account.period,date_stop:0
@@ -9280,12 +10102,12 @@
 #: model:ir.actions.act_window,name:account.action_account_report
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
-msgstr ""
+msgstr "Financijski izvještaji"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability_view1
 msgid "Liability View"
-msgstr ""
+msgstr "Pogled obveza"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9313,7 +10135,7 @@
 #: field:accounting.report,period_from:0
 #: field:accounting.report,period_from_cmp:0
 msgid "Start Period"
-msgstr ""
+msgstr "Početni period"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
@@ -9333,7 +10155,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Ask Refund"
-msgstr ""
+msgstr "Zatraži povrat"
 
 #. module: account
 #: view:account.move.line:0
@@ -9343,7 +10165,7 @@
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliervalidentries0
 msgid "Accountant validates the accounting entries coming from the invoice. "
-msgstr ""
+msgstr "Knjigovođa potvrđuje dnevničke zapise nastale potvrdom fakture. "
 
 #. module: account
 #: field:account.subscription,period_total:0
@@ -9358,18 +10180,18 @@
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr ""
+msgstr "Konta potraživanja"
 
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_prefix:0
 msgid "Supplier credit note sequence"
-msgstr ""
+msgstr "Sekvenca odobrenja dobavljača"
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:37
 #, python-format
 msgid "Invoice is already reconciled."
-msgstr ""
+msgstr "Faktura je već zatvorena"
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -9381,6 +10203,12 @@
 "payments.\n"
 "                This installs the module account_payment."
 msgstr ""
+"Omogućuje da kreirate i upravljate vašim nalozima za plaćanje, sa svrhom\n"
+"                    * da služi kao baza za jednostavno ukopčavanje raznih "
+"automatiziranih mehanizama plaćanja\n"
+"                    * i da osigura efikasniji način za upravljanje plaćanjem "
+"faktura.\n"
+"                Instalira modul account_payment."
 
 #. module: account
 #: xsl:account.transfer:0
@@ -9398,7 +10226,7 @@
 #: code:addons/account/account_move_line.py:824
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
-msgstr ""
+msgstr "Kompanija treba biti ista za sve stavke zatvaranja."
 
 #. module: account
 #: field:account.account,balance:0
@@ -9429,13 +10257,13 @@
 #. module: account
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Manually or automatically entered in the system"
-msgstr ""
+msgstr "Ručno ili automatski unešeno u sistem"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.general.ledger_landscape:0
 msgid "Display Account"
-msgstr ""
+msgstr "Prikaži konto"
 
 #. module: account
 #: selection:account.account,type:0
@@ -9446,6 +10274,14 @@
 msgstr "Duguje"
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:account.account:0
+msgid "Account name"
+msgstr "Naziv konta"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:board.board:0
 msgid "Account Board"
 msgstr "Tabla konta"
@@ -9459,30 +10295,37 @@
 #. module: account
 #: model:process.transition,note:account.process_transition_entriesreconcile0
 msgid "Accounting entries are the first input of the reconciliation."
-msgstr ""
+msgstr "Dnevnički zapisi su prvi unos zatvaranja."
 
 #. module: account
+<<<<<<< TREE
 #: view:account.fiscalyear.close:0
 msgid "Generate Fiscal Year Opening Entries"
 msgstr "Generiraj stavke za otvaranje fiskalne godine"
+=======
+#: code:addons/account/account_cash_statement.py:301
+#, python-format
+msgid "There is no %s Account on the journal %s."
+msgstr "Nema %s konta na dnevniku %s."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr ""
+msgstr "Filtriraj po"
 
 #. module: account
 #: field:account.cashbox.line,number_closing:0
 #: field:account.cashbox.line,number_opening:0
 msgid "Number of Units"
-msgstr ""
+msgstr "Broj jedinica"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr ""
+msgstr "Ručni unos"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -9500,17 +10343,17 @@
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Neispravna akcija!"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Date / Period"
-msgstr ""
+msgstr "Datum / Period"
 
 #. module: account
 #: report:account.central.journal:0
 msgid "A/C No."
-msgstr ""
+msgstr "A/C Br."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
@@ -9524,11 +10367,14 @@
 "The period is invalid. Either some periods are overlapping or the period's "
 "dates are not matching the scope of the fiscal year."
 msgstr ""
+"Greška!\n"
+"Period je neispravan. Ili se neki periodi preklapaju, ili datumi perioda ne "
+"odgovaraju rasponu fiskalne godine."
 
 #. module: account
 #: report:account.overdue:0
 msgid "There is nothing due with this customer."
-msgstr ""
+msgstr "Nema dospijelih stavaki kod ovog kupca."
 
 #. module: account
 #: help:account.tax,account_paid_id:0
@@ -9536,17 +10382,20 @@
 "Set the account that will be set by default on invoice tax lines for "
 "refunds. Leave empty to use the expense account."
 msgstr ""
+"Postavite konto koji će se koristiti kao predodređeni na stavkama poreza kod "
+"faktura za povrat. Ostavite prazno za konto troška."
 
 #. module: account
 #: help:account.addtmpl.wizard,cparent_id:0
 msgid ""
 "Creates an account with the selected template under this existing parent."
 msgstr ""
+"Kreira konto s odabranim predloškom pod postojećim nadređenim kontom."
 
 #. module: account
 #: report:account.invoice:0
 msgid "Source"
-msgstr ""
+msgstr "Izvor"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -9560,6 +10409,8 @@
 "You have to define the bank account\n"
 "in the journal definition for reconciliation."
 msgstr ""
+"Morate definisati konto banke\n"
+"u postavkama dnevnika za zatvaranje."
 
 #. module: account
 #: help:account.journal,sequence_id:0
@@ -9567,22 +10418,23 @@
 "This field contains the information related to the numbering of the journal "
 "entries of this journal."
 msgstr ""
+"Ovo polje sadržava informacije vezane uz sljedivosti dnevničkih zapisa"
 
 #. module: account
 #: field:account.invoice,sent:0
 msgid "Sent"
-msgstr ""
+msgstr "Poslato"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
 msgid "Common Report"
-msgstr ""
+msgstr "Izvještaji"
 
 #. module: account
 #: field:account.config.settings,default_sale_tax:0
 #: field:account.config.settings,sale_tax:0
 msgid "Default sale tax"
-msgstr ""
+msgstr "Zadani porez prodaje"
 
 #. module: account
 #: report:account.overdue:0
@@ -9593,24 +10445,24 @@
 #: code:addons/account/account.py:1587
 #, python-format
 msgid "Cannot create moves for different companies."
-msgstr ""
+msgstr "Nije moguće kreirati knjiženja za različite kompanije."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodic Processing"
-msgstr ""
+msgstr "Periodična obrada"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
-msgstr ""
+msgstr "Ulazne i izlazne fakture"
 
 #. module: account
 #: model:process.node,note:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment entries"
-msgstr ""
+msgstr "Stavke plaćanja"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9619,7 +10471,7 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "July"
-msgstr ""
+msgstr "Jul"
 
 #. module: account
 #: view:account.account:0
@@ -9634,7 +10486,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr ""
+msgstr "Saldo analitike"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9662,29 +10514,29 @@
 #: field:accounting.report,period_to:0
 #: field:accounting.report,period_to_cmp:0
 msgid "End Period"
-msgstr ""
+msgstr "Krajnji period"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_expense_view1
 msgid "Expense View"
-msgstr ""
+msgstr "Pregled troškova"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr ""
+msgstr "Datum dospijeća"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_immediate
 #: model:account.payment.term,note:account.account_payment_term_immediate
 msgid "Immediate Payment"
-msgstr ""
+msgstr "Neposredno plaćanje"
 
 #. module: account
 #: code:addons/account/account.py:1502
 #, python-format
 msgid " Centralisation"
-msgstr ""
+msgstr " Centralizacija"
 
 #. module: account
 #: help:account.journal,type:0
@@ -9695,6 +10547,11 @@
 "journals. Select 'Opening/Closing Situation' for entries generated for new "
 "fiscal years."
 msgstr ""
+"Odaberite 'Prodaja' za dnevnike izlaznih faktura. Odaberite 'Nabava' za "
+"dnevnike ulaznih faktura. Odaberite 'Gotovina' ili 'Banka' za dnevnike koji "
+"se koriste kod plaćanja izlaznih ili ulaznih faktura. Odaberite 'Općenito' "
+"za dnevnike raznih drugih operacija. Odaberite 'Početno/završno stanje' za "
+"unose generisanje sa novom fiskalnom godinom."
 
 #. module: account
 #: view:account.subscription:0
@@ -9748,8 +10605,19 @@
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
 msgstr ""
-
-#. module: account
+"Označava da je faktura plaćena i da je dnevnički zapis fakture zatvoren sa "
+"jednim ili više izvoda."
+
+#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_move_line.py:780
+#, python-format
+msgid "Journal Item '%s' (id: %s), Move '%s' is already reconciled!"
+msgstr "Stavka dnevnika '%s' (id: %s), Knjiženje '%s' je već zatvoreno!"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: model:process.node,name:account.process_node_supplierdraftinvoices0
@@ -9757,10 +10625,20 @@
 msgstr "Fakture u pripremi"
 
 #. module: account
+<<<<<<< TREE
+=======
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
+#, python-format
+msgid "Nothing more to reconcile"
+msgstr "Nema stavaka za zatvaranje"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:cash.box.in:0
 #: model:ir.actions.act_window,name:account.action_cash_box_in
 msgid "Put Money In"
-msgstr ""
+msgstr "Primi novac"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -9773,7 +10651,7 @@
 #: code:addons/account/account_invoice.py:922
 #, python-format
 msgid "Bad total !"
-msgstr ""
+msgstr "Pogrešan ukupni iznos !"
 
 #. module: account
 #: field:account.journal,sequence_id:0
@@ -9791,6 +10669,13 @@
 "open period. Close a period when you do not want to record new entries and "
 "want to lock this period for tax related calculation."
 msgstr ""
+"Period je fiskalno razdoblje tokom kojeg treba biti zabilježena evidencija "
+"svih računovodstvenih aktivnosti. Mjesečni periodu su standard, ali ovisno o "
+"vašoj državi ili potrebama kompanije možete također imati i kvartalne "
+"periode. Zatvaranje perioda će onemogućiti unos novih knjiženja. Sva nova "
+"knjiženja trebaju tada ići na sljedeći otvoreni period. Zatvorite perioda "
+"kada ne želite nova knjiženja i kada želite zaključati period za potrebe "
+"poreznih evidencija."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -9807,12 +10692,12 @@
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr ""
+msgstr "Iz analitičkog konta"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure your Fiscal Year"
-msgstr ""
+msgstr "Postavite fiskalnu godinu"
 
 #. module: account
 #: field:account.period,name:0
@@ -9826,6 +10711,8 @@
 "Selected invoice(s) cannot be cancelled as they are already in 'Cancelled' "
 "or 'Done' state."
 msgstr ""
+"Odabrani(e) račun(e) nije moguće otkazati jer su već u statusu 'Otkazano' "
+"ili 'Potvrđeno'."
 
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
@@ -9847,12 +10734,12 @@
 #: model:ir.model,name:account.model_account_move_line
 #: model:ir.ui.menu,name:account.menu_action_account_moves_all
 msgid "Journal Items"
-msgstr ""
+msgstr "Stavke dnevnika"
 
 #. module: account
 #: view:accounting.report:0
 msgid "Comparison"
-msgstr ""
+msgstr "Poređenje"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1119
@@ -9862,6 +10749,9 @@
 "some non legal fields or you must unconfirm the journal entry first.\n"
 "%s."
 msgstr ""
+"Ne možete raditi ovu promjenu na knjiženom unosu. Možete samo mijenjati neka "
+"sporedna polja ili morate prvo rasknjižiti dnevničke zapise.\n"
+"%s."
 
 #. module: account
 #: help:account.config.settings,module_account_budget:0
@@ -9872,11 +10762,17 @@
 "analytic account.\n"
 "                This installs the module account_budget."
 msgstr ""
+"Ovo omogućuje računovođama da upravljalju analitičkim i miješanim "
+"proračunima.\n"
+"                Jednom kada je glavni proračun definisan,\n"
+"                voditelji projekta mogu postaviti planirani iznos na svaki "
+"analitički konto.\n"
+"                Instalira modul account_budget."
 
 #. module: account
 #: field:account.bank.statement.line,name:0
 msgid "OBI"
-msgstr ""
+msgstr "JIB/JBMG"
 
 #. module: account
 #: help:res.partner,property_account_payable:0
@@ -9902,7 +10798,7 @@
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr ""
+msgstr "Potvrdi knjiženje"
 
 #. module: account
 #: field:account.account,credit:0
@@ -9931,29 +10827,29 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Invoice "
-msgstr ""
+msgstr "Faktura u pripremi "
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
 msgid "General Journals"
-msgstr ""
+msgstr "Opšti dnevnici"
 
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr ""
+msgstr "Model dnevničkog zapisa"
 
 #. module: account
 #: code:addons/account/account.py:1073
 #, python-format
 msgid "Start period should precede then end period."
-msgstr ""
+msgstr "Početno razdoblje bi trebalo prethoditi završnom razdoblju"
 
 #. module: account
 #: field:account.invoice,number:0
 #: field:account.move,name:0
 msgid "Number"
-msgstr ""
+msgstr "Broj"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9968,7 +10864,7 @@
 #: field:account.invoice.report,price_total:0
 #: field:account.invoice.report,user_currency_price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Uk. prije poreza"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -10004,9 +10900,17 @@
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr ""
-
-#. module: account
+msgstr "Kursna lista"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.config.settings:0
+msgid "e.g. sales@xxxxxxxxxxx"
+msgstr "npr. prodaja@xxxxxxxxxxx"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.account,tax_ids:0
 #: view:account.account.template:0
 #: field:account.account.template,tax_ids:0
@@ -10021,12 +10925,12 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "Dobit (gubitak) za prijavu"
 
 #. module: account
 #: code:addons/account/account_invoice.py:379
@@ -10037,17 +10941,17 @@
 #. module: account
 #: view:account.move.line.reconcile.select:0
 msgid "Open for Reconciliation"
-msgstr ""
+msgstr "Otvori za saldakonti zatvaranje"
 
 #. module: account
 #: field:account.account,parent_left:0
 msgid "Parent Left"
-msgstr ""
+msgstr "Roditelj lijevo"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 2 (bold)"
-msgstr ""
+msgstr "Naslov 2 (bold)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree2
@@ -10078,6 +10982,9 @@
 "and is the process of transferring debit and credit amounts from a journal "
 "of original entry to a ledger book."
 msgstr ""
+"Ažuriranje temeljnice \"knjiženje u gl. knjigu\" je proces prijenosa iznosa "
+"duguje i potražuje iz dnevnika u glavnu knjigu. Kod nekih izvještaja možete "
+"birati između ažuriranih stavaka ili svih evidentiranih stavki."
 
 #. module: account
 #: model:ir.model,name:account.model_account_period
@@ -10094,7 +11001,7 @@
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr ""
+msgstr "Običan"
 
 #. module: account
 #: view:account.account:0
@@ -10108,7 +11015,7 @@
 #. module: account
 #: field:account.subscription.generate,date:0
 msgid "Generate Entries Before"
-msgstr ""
+msgstr "Generiši stavke prije"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -10187,14 +11094,14 @@
 #. module: account
 #: selection:account.financial.report,display_detail:0
 msgid "No detail"
-msgstr ""
+msgstr "Nema detalja"
 
 #. module: account
 #: field:account.account,unrealized_gain_loss:0
 #: model:ir.actions.act_window,name:account.action_account_gain_loss
 #: model:ir.ui.menu,name:account.menu_unrealized_gains_losses
 msgid "Unrealized Gain or Loss"
-msgstr ""
+msgstr "Nerealizovani dobit ili gubitak"
 
 #. module: account
 #: view:account.move:0
@@ -10207,11 +11114,13 @@
 #: help:product.template,property_account_income:0
 msgid "This account will be used to value outgoing stock using sale price."
 msgstr ""
+"Ovaj će se konto koristiti za vrednovanje skladišnog izlaza koristeći "
+"prodajnu cijenu."
 
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr ""
+msgstr "Kontrola uk. iznosa"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -10229,12 +11138,12 @@
 #: code:addons/account/wizard/account_invoice_refund.py:109
 #, python-format
 msgid "Cannot %s draft/proforma/cancel invoice."
-msgstr ""
+msgstr "Ne mogu %s u pripremi/proforma/otkaži fakturu."
 
 #. module: account
 #: field:account.tax,account_analytic_paid_id:0
 msgid "Refund Tax Analytic Account"
-msgstr ""
+msgstr "Analitički konto poreza kod povrata"
 
 #. module: account
 #: view:account.move.bank.reconcile:0
@@ -10293,19 +11202,19 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr ""
+msgstr "Postavlja ponavljajuće zapise"
 
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr ""
+msgstr "Datum valute"
 
 #. module: account
 #: field:account.invoice.refund,description:0
 #: field:cash.box.in,name:0
 #: field:cash.box.out,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Razlog"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -10313,7 +11222,7 @@
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
-msgstr ""
+msgstr "Otvorene stavke"
 
 #. module: account
 #: help:account.partner.reconcile.process,today_reconciled:0
@@ -10322,6 +11231,8 @@
 "reconciliation process today. The current partner is counted as already "
 "processed."
 msgstr ""
+"Ova brojka opisuje ukupni broj partenera koji su prošli proces zatvaranja "
+"danas. Trenutni partner se računa."
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -10331,12 +11242,12 @@
 #. module: account
 #: field:account.tax.code.template,sign:0
 msgid "Sign For Parent"
-msgstr ""
+msgstr "Predznak za nadređenog"
 
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr ""
+msgstr "Izvještaj stanja bilansa"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
@@ -10347,12 +11258,12 @@
 #: model:process.transition,note:account.process_transition_statemententries0
 msgid ""
 "Manual or automatic creation of payment entries according to the statements"
-msgstr ""
+msgstr "Ručno ili automatsko kreiranje stavki plaćanja prema izvodima"
 
 #. module: account
 #: field:account.analytic.balance,empty_acc:0
 msgid "Empty Accounts ? "
-msgstr ""
+msgstr "Prazna konta ? "
 
 #. module: account
 #: view:account.unreconcile.reconcile:0
@@ -10360,17 +11271,19 @@
 "If you unreconcile transactions, you must also verify all the actions that "
 "are linked to those transactions because they will not be disable"
 msgstr ""
+"Ako razvezujete transakcije, morate također provjeriti akcije koje su "
+"povezane sa tim transakcijama jer će one ostati aktivne."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1056
 #, python-format
 msgid "Unable to change tax!"
-msgstr ""
+msgstr "Nije moguće izmjeniti porez!"
 
 #. module: account
 #: constraint:account.bank.statement:0
 msgid "The journal and period chosen have to belong to the same company."
-msgstr ""
+msgstr "Dnevnik i odabrano razdoblje moraju pripadati istom poduzeću."
 
 #. module: account
 #: view:account.invoice:0
@@ -10380,12 +11293,12 @@
 #. module: account
 #: field:account.chart,period_to:0
 msgid "End period"
-msgstr ""
+msgstr "Završni period"
 
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The code of the journal must be unique per company !"
-msgstr ""
+msgstr "Šifra dnevnika mora biti jedinstvena (za kompaniju) !"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_invoice_report_all
@@ -10394,11 +11307,14 @@
 "customer. The tool search can also be used to personalise your Invoices "
 "reports and so, match this analysis to your needs."
 msgstr ""
+"Iz ovog izvještaja imate pregled iznosa fakturisanog vašem kupcu. Alat "
+"pretrage može se također koristiti za personalizaciju vaših ispisa računa i "
+"priagođavanje analize vašim potrebama."
 
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to Next Partner"
-msgstr ""
+msgstr "Idi na slijedećeg partnera"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -10409,22 +11325,22 @@
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr ""
+msgstr "Stanje računa je zatvoreno/plaćeno"
 
 #. module: account
 #: field:account.config.settings,module_account_followup:0
 msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "Upravljanje naplatom"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "Izvještaj o prodaji po kontu"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr ""
+msgstr "Fiskalna pozicija"
 
 #. module: account
 #: report:account.invoice:0
@@ -10465,7 +11381,7 @@
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Title 3 (bold, smaller)"
-msgstr ""
+msgstr "Naslov 3 (podebljano, manje)"
 
 #. module: account
 #: view:account.invoice:0
@@ -10476,7 +11392,7 @@
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr ""
+msgstr "Neobavezna količina"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
@@ -10507,7 +11423,7 @@
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr ""
+msgstr "Stavke analitničkog dnevnika povezane sa dnevnikom nabave"
 
 #. module: account
 #: help:account.account,type:0
@@ -10518,6 +11434,10 @@
 "payable/receivable are for partners accounts (for debit/credit "
 "computations), closed for depreciated accounts."
 msgstr ""
+"'Interni tip' se koristi za značajke dostupne na različitim tipovima konta: "
+"pogled ne može imati stavke dnevnika, konsolidacija su konta koja mogu imati "
+"podređena konta za potrebe konsolidacije više kompanija, obveze/potraživanja "
+"su za saldakonti, zatvoreno za  konta koja se više ne koriste."
 
 #. module: account
 #: report:account.account.balance:0
@@ -10543,6 +11463,8 @@
 msgid ""
 "This is a field only used for internal purpose and shouldn't be displayed"
 msgstr ""
+"Ovo se polje koristi isključivo za interne potrebe i nebi se trebalo "
+"prikazivati"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10551,18 +11473,18 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr ""
+msgstr "Decembar"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Grupiraj po mjesecu fakture"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:99
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)."
-msgstr ""
+msgstr "Nije definisan konto prihoda za proizvod: \"%s\" (id:%d)."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
@@ -10573,7 +11495,7 @@
 #. module: account
 #: field:account.tax,applicable_type:0
 msgid "Applicability"
-msgstr ""
+msgstr "Primjenjivost"
 
 #. module: account
 #: help:account.move.line,currency_id:0
@@ -10584,18 +11506,18 @@
 #: model:process.transition,note:account.process_transition_invoiceimport0
 msgid ""
 "Import of the statement in the system from a supplier or customer invoice"
-msgstr ""
+msgstr "Uvoz stavke u sistem iz fakture dobavljača ili kupca"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr ""
+msgstr "Računi"
 
 #. module: account
 #: view:account.account:0
 #: view:account.analytic.account:0
 msgid "Parent Account"
-msgstr ""
+msgstr "Roditeljski račun"
 
 #. module: account
 #: view:report.account.receivable:0
@@ -10605,7 +11527,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr ""
+msgstr "Analitički kontni plan"
 
 #. module: account
 #: help:account.invoice,residual:0
@@ -10615,7 +11537,7 @@
 #. module: account
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted by"
-msgstr ""
+msgstr "Sortirano po"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1546
@@ -10624,6 +11546,7 @@
 "The selected unit of measure is not compatible with the unit of measure of "
 "the product."
 msgstr ""
+"Odabrana jedinica mjere nije kompatibilna sa jedinicom mjere proizvoda."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -10647,6 +11570,16 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Pritisnite za kreiranje nove porezne tarife.\n"
+"              </p><p>\n"
+"                Ovisno o legislativi pojedine zemlje, porezne se tarife "
+"koriste za\n"
+"                poreznu prijavu. OpenERP omogućuje definisanje kompleksne "
+"strukture\n"
+"                porezne prijave.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10655,7 +11588,7 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr ""
+msgstr "Novembar"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_all_a
@@ -10673,6 +11606,14 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Odaberite razdoblje i dnevnik koji želite kreirati.\n"
+"              </p><p>\n"
+"                Kroz ovaj modul moguće je jednostavno i efikasno "
+"evidentirati\n"
+"                stavke glavne knjige.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: help:account.invoice.line,account_id:0
@@ -10682,7 +11623,7 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "Install more chart templates"
-msgstr ""
+msgstr "Instaliraj dodatne predloške kontog plana"
 
 #. module: account
 #: report:account.general.journal:0
@@ -10693,7 +11634,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Search Invoice"
-msgstr ""
+msgstr "Pretraži fakture"
 
 #. module: account
 #: report:account.invoice:0
@@ -10723,7 +11664,7 @@
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Accounting Documents"
-msgstr ""
+msgstr "Dokumenti računovodstva"
 
 #. module: account
 #: code:addons/account/account.py:641
@@ -10731,39 +11672,39 @@
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
 "supplier."
-msgstr ""
+msgstr "Ne možete ukloniti/deaktivirati konto kupca ili dobavljača"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "Ažuriraj stavke"
 
 #. module: account
 #: help:res.partner,property_account_position:0
 msgid ""
 "The fiscal position will determine taxes and accounts used for the partner."
-msgstr ""
+msgstr "Fiskalna pozicija određuje poreze i konta za partnera."
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr ""
+msgstr "Stanje faktura je zatvoreno/plaćeno."
 
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 msgid "As soon as the reconciliation is done, the invoice can be paid."
-msgstr ""
+msgstr "Čim je obavljeno zatvaranje, faktura može biti plaćena."
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly."
-msgstr ""
+msgstr "Nova valuta nije ispravno postavljena."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr ""
+msgstr "Traži predloške konta"
 
 #. module: account
 #: view:account.invoice.tax:0
@@ -10774,12 +11715,12 @@
 #: code:addons/account/account_invoice.py:573
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
-msgstr ""
+msgstr "Uslovi plaćanja dobavljača nema definisane stavke uslova plaćanja"
 
 #. module: account
 #: field:account.account,parent_right:0
 msgid "Parent Right"
-msgstr ""
+msgstr "Roditelj desno"
 
 #. module: account
 #. openerp-web
@@ -10787,12 +11728,12 @@
 #: code:addons/account/static/src/js/account_move_reconciliation.js:80
 #, python-format
 msgid "Never"
-msgstr ""
+msgstr "Nikada"
 
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
 msgid "account.addtmpl.wizard"
-msgstr ""
+msgstr "account.addtmpl.wizard"
 
 #. module: account
 #: field:account.aged.trial.balance,result_selection:0
@@ -10803,12 +11744,12 @@
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr ""
+msgstr "Partneri"
 
 #. module: account
 #: field:account.account,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne zabilješke"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear
@@ -10823,6 +11764,8 @@
 "If the active field is set to False, it will allow you to hide the analytic "
 "journal without removing it."
 msgstr ""
+"Ako aktivno polje postavljeno na False, to će vam omogućiti da sakrijete "
+"analitiku dnevničkih zapisa bez da ih uklonite."
 
 #. module: account
 #: field:account.analytic.line,ref:0

=== modified file 'account/i18n/da.po'
--- account/i18n/da.po	2013-10-18 12:58:18 +0000
+++ account/i18n/da.po	2013-11-12 13:23:09 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:09+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+=======
+"POT-Creation-Date: 2013-06-14 22:29+0000\n"
+"PO-Revision-Date: 2013-11-05 20:55+0000\n"
+"Last-Translator: Morten Schou <ms@xxxxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Danish <da@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-09-12 05:24+0000\n"
 "X-Generator: Launchpad (build 16761)\n"
+=======
+"X-Launchpad-Export-Date: 2013-11-06 05:50+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -66,7 +77,7 @@
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
 msgid "Aged Receivable Till Today"
-msgstr ""
+msgstr "Aldersopdelte tilgodehavender til i dag"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_invoiceimport0
@@ -319,7 +330,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr ""
+msgstr "Konto mod-udligning"
 
 #. module: account
 #: field:account.config.settings,module_account_budget:0
@@ -450,7 +461,7 @@
 #: field:account.tax.template,chart_template_id:0
 #: field:wizard.multi.charts.accounts,chart_template_id:0
 msgid "Chart Template"
-msgstr ""
+msgstr "Oversigts skabelon"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
@@ -559,7 +570,7 @@
 #: help:account.vat.declaration,chart_account_id:0
 #: help:accounting.report,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr ""
+msgstr "Vælg kontoplan"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
@@ -580,7 +591,7 @@
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Modpost"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -610,7 +621,11 @@
 #. module: account
 #: field:account.config.settings,decimal_precision:0
 msgid "Decimal precision on journal entries"
+<<<<<<< TREE
 msgstr ""
+=======
+msgstr "Decimal nøjagtighed ved posteringer"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -627,7 +642,7 @@
 #: field:account.financial.report,account_report_id:0
 #: selection:account.financial.report,type:0
 msgid "Report Value"
-msgstr ""
+msgstr "Rapport værdi"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:39
@@ -658,7 +673,7 @@
 #: code:addons/account/wizard/account_change_currency.py:70
 #, python-format
 msgid "Current currency is not configured properly."
-msgstr ""
+msgstr "Aktuel valuta er ikke konfigureret korrekt"
 
 #. module: account
 #: field:account.journal,profit_account_id:0
@@ -670,11 +685,12 @@
 #, python-format
 msgid "No period found or more than one period found for the given date."
 msgstr ""
+"Ingen periode eller mere end en periode blev fundet for den anførte dato."
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr ""
+msgstr "Salgsrapport pr. konto type"
 
 #. module: account
 #: code:addons/account/account.py:3201
@@ -699,7 +715,7 @@
 #: view:account.period:0
 #: view:account.period.close:0
 msgid "Close Period"
-msgstr ""
+msgstr "Luk periode"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
@@ -709,12 +725,12 @@
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr ""
+msgstr "Åbnings periode"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr ""
+msgstr "Kladde periode"
 
 #. module: account
 #: constraint:account.move:0
@@ -741,17 +757,17 @@
 #: code:addons/account/report/account_partner_ledger.py:272
 #, python-format
 msgid "Receivable Accounts"
-msgstr ""
+msgstr "Debitor konti"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "Configure your company bank accounts"
-msgstr ""
+msgstr "Opsæt firmaets bank konti"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Create Refund"
-msgstr ""
+msgstr "Opret kreditnota"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -763,12 +779,12 @@
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
 msgid "General Ledger Report"
-msgstr ""
+msgstr "Finans rapport"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr ""
+msgstr "Gen-åben"
 
 #. module: account
 #: view:account.use.model:0
@@ -779,12 +795,12 @@
 #: code:addons/account/account_invoice.py:1361
 #, python-format
 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
-msgstr ""
+msgstr "Faktura delvist betalt: %s%s of %s%s (%s%s remaining)."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Print Invoice"
-msgstr ""
+msgstr "Udskriv faktura"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:111
@@ -803,12 +819,12 @@
 #: selection:account.payment.term.line,value:0
 #: selection:account.tax.template,type:0
 msgid "Percent"
-msgstr ""
+msgstr "Procent"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_charts
 msgid "Charts"
-msgstr ""
+msgstr "Oversigter"
 
 #. module: account
 #: code:addons/account/project/wizard/project_account_analytic_line.py:47
@@ -820,12 +836,12 @@
 #. module: account
 #: field:account.invoice.refund,filter_refund:0
 msgid "Refund Method"
-msgstr ""
+msgstr "Krediterings metode"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report
 msgid "Financial Report"
-msgstr ""
+msgstr "Finans rapport"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -842,7 +858,7 @@
 #: xsl:account.transfer:0
 #: field:report.invoice.created,type:0
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #. module: account
 #: code:addons/account/account_invoice.py:826
@@ -850,7 +866,7 @@
 msgid ""
 "Taxes are missing!\n"
 "Click on compute button."
-msgstr ""
+msgstr "Moms mangler"
 
 #. module: account
 #: model:ir.model,name:account.model_account_subscription_line
@@ -860,7 +876,7 @@
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr ""
+msgstr "Partner reference for denne faktura"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -871,24 +887,24 @@
 #: code:addons/account/account_move_line.py:851
 #, python-format
 msgid "Entry is already reconciled."
-msgstr ""
+msgstr "Postering er allerede udlignet"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 #: view:account.unreconcile.reconcile:0
 #: model:ir.model,name:account.model_account_move_line_unreconcile_select
 msgid "Unreconciliation"
-msgstr ""
+msgstr "af-udligning"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
-msgstr ""
+msgstr "Konto i analytisk journal"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Send by Email"
-msgstr ""
+msgstr "Send pr. e-mail"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -917,12 +933,22 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "September"
-msgstr ""
-
-#. module: account
+msgstr "September"
+
+#. module: account
+<<<<<<< TREE
+=======
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
+#, python-format
+msgid "Latest Manual Reconciliation Processed:"
+msgstr "Seneste manuelle afstemning/udligning:"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.subscription,period_type:0
 msgid "days"
-msgstr ""
+msgstr "dage"
 
 #. module: account
 #: help:account.account.template,nocreate:0
@@ -957,24 +983,24 @@
 #: view:account.payment.term:0
 #: field:account.payment.term.line,value:0
 msgid "Computation"
-msgstr ""
+msgstr "Beregning"
 
 #. module: account
 #: field:account.journal.cashbox.line,pieces:0
 msgid "Values"
-msgstr ""
+msgstr "Værdier"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_tax_chart
 #: model:ir.actions.act_window,name:account.action_tax_code_tree
 #: model:ir.ui.menu,name:account.menu_action_tax_code_tree
 msgid "Chart of Taxes"
-msgstr ""
+msgstr "Moms oversigt"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create 3 Months Periods"
-msgstr ""
+msgstr "Opret 3 måneders perioder"
 
 #. module: account
 #: report:account.overdue:0
@@ -984,25 +1010,25 @@
 #. module: account
 #: field:account.config.settings,purchase_journal_id:0
 msgid "Purchase journal"
-msgstr ""
+msgstr "Indkøbs journal"
 
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_paid
 msgid "Invoice paid"
-msgstr ""
+msgstr "Faktura betalt"
 
 #. module: account
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Approve"
-msgstr ""
+msgstr "Godkende"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.move:0
 #: view:report.invoice.created:0
 msgid "Total Amount"
-msgstr ""
+msgstr "Totalt beløb"
 
 #. module: account
 #: help:account.invoice,supplier_invoice_number:0
@@ -1014,14 +1040,14 @@
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Consolidation"
-msgstr ""
+msgstr "Konsolidering"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_liability
 #: model:account.financial.report,name:account.account_financial_report_liability0
 #: model:account.financial.report,name:account.account_financial_report_liabilitysum0
 msgid "Liability"
-msgstr ""
+msgstr "Gæld"
 
 #. module: account
 #: code:addons/account/account_invoice.py:899
@@ -1032,7 +1058,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "Extended Filters..."
-msgstr ""
+msgstr "Udvidede filtre"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_central_journal
@@ -1042,17 +1068,17 @@
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr ""
+msgstr "Salgs kreditnota"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
 msgid "Bank statement"
-msgstr ""
+msgstr "Bank kontoudtog"
 
 #. module: account
 #: field:account.analytic.line,move_id:0
 msgid "Move Line"
-msgstr ""
+msgstr "Flyt linie"
 
 #. module: account
 #: help:account.move.line,tax_amount:0
@@ -1065,7 +1091,7 @@
 #. module: account
 #: view:account.analytic.line:0
 msgid "Purchases"
-msgstr ""
+msgstr "Indkøb"
 
 #. module: account
 #: field:account.model,lines_id:0
@@ -1087,12 +1113,12 @@
 #: report:account.partner.balance:0
 #: field:account.period,code:0
 msgid "Code"
-msgstr ""
+msgstr "Kode"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Funktionalitet"
 
 #. module: account
 #: code:addons/account/account.py:2346
@@ -1102,7 +1128,7 @@
 #: code:addons/account/account_move_line.py:195
 #, python-format
 msgid "No Analytic Journal !"
-msgstr ""
+msgstr "Ingen analytisk journal"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1110,7 +1136,7 @@
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
 msgid "Partner Balance"
-msgstr ""
+msgstr "Partner balance"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_gain_loss
@@ -1137,7 +1163,7 @@
 #. module: account
 #: field:account.journal,with_last_closing_balance:0
 msgid "Opening With Last Closing Balance"
-msgstr ""
+msgstr "Åbning med sidste afslutnings balance"
 
 #. module: account
 #: help:account.tax.code,notprintable:0
@@ -1149,17 +1175,17 @@
 #. module: account
 #: field:report.account.receivable,name:0
 msgid "Week of Year"
-msgstr ""
+msgstr "Uge i året"
 
 #. module: account
 #: field:account.report.general.ledger,landscape:0
 msgid "Landscape Mode"
-msgstr ""
+msgstr "Liggende"
 
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr ""
+msgstr "Vælg regnskabsår der skal lukkes"
 
 #. module: account
 #: help:account.account.template,user_type:0
@@ -1171,7 +1197,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Refund "
-msgstr ""
+msgstr "Kreditering "
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:90
@@ -1182,7 +1208,7 @@
 #. module: account
 #: view:account.tax:0
 msgid "Applicability Options"
-msgstr ""
+msgstr "Anvendeligheds muligheder"
 
 #. module: account
 #: report:account.partner.balance:0
@@ -1194,12 +1220,12 @@
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr ""
+msgstr "Kontant kasser"
 
 #. module: account
 #: field:account.config.settings,sale_refund_journal_id:0
 msgid "Sale refund journal"
-msgstr ""
+msgstr "Salgs krediteringsjournal"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -1225,22 +1251,22 @@
 #: code:addons/account/account.py:3092
 #, python-format
 msgid "Bank"
-msgstr ""
+msgstr "Bank"
 
 #. module: account
 #: field:account.period,date_start:0
 msgid "Start of Period"
-msgstr ""
+msgstr "Start på periode"
 
 #. module: account
 #: view:account.tax:0
 msgid "Refunds"
-msgstr ""
+msgstr "Krediteringer"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
-msgstr ""
+msgstr "Bekræft opgørelse"
 
 #. module: account
 #: view:account.tax:0
@@ -1258,7 +1284,7 @@
 #: field:account.fiscal.position.tax,tax_dest_id:0
 #: field:account.fiscal.position.tax.template,tax_dest_id:0
 msgid "Replacement Tax"
-msgstr ""
+msgstr "Erstatnings moms"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -1269,7 +1295,7 @@
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr ""
+msgstr "Moms skabeloner"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -1281,17 +1307,17 @@
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr ""
+msgstr "Annnulér fakturaer"
 
 #. module: account
 #: help:account.journal,code:0
 msgid "The code will be displayed on reports."
-msgstr ""
+msgstr "Koden vises i rapporter"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
-msgstr ""
+msgstr "Moms i indkøb"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1300,18 +1326,18 @@
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr ""
+msgstr "Momskode"
 
 #. module: account
 #: field:account.account,currency_mode:0
 msgid "Outgoing Currencies Rate"
-msgstr ""
+msgstr "Valutakurs-princip"
 
 #. module: account
 #: view:account.analytic.account:0
 #: field:account.config.settings,chart_template_id:0
 msgid "Template"
-msgstr ""
+msgstr "Skabelon"
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -1346,7 +1372,7 @@
 #: view:account.analytic.line:0
 #: view:account.journal:0
 msgid "Others"
-msgstr ""
+msgstr "Øvrige"
 
 #. module: account
 #: view:account.subscription:0
@@ -1379,25 +1405,25 @@
 #: model:ir.model,name:account.model_account_account
 #: field:report.account.sales,account_id:0
 msgid "Account"
-msgstr ""
+msgstr "Konto"
 
 #. module: account
 #: field:account.tax,include_base_amount:0
 msgid "Included in base amount"
-msgstr ""
+msgstr "Inkluderet i basis-beløb"
 
 #. module: account
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.action_account_entries_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_entries_report_all
 msgid "Entries Analysis"
-msgstr ""
+msgstr "Posterings analyse"
 
 #. module: account
 #: field:account.account,level:0
 #: field:account.financial.report,level:0
 msgid "Level"
-msgstr ""
+msgstr "Niveau"
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:38
@@ -1417,19 +1443,19 @@
 #: model:ir.ui.menu,name:account.menu_tax_report
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr ""
+msgstr "Afgifter/moms"
 
 #. module: account
 #: code:addons/account/wizard/account_financial_report.py:70
 #, python-format
 msgid "Select a starting and an ending period"
-msgstr ""
+msgstr "Vælg en start og slut periode"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
 #: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
-msgstr ""
+msgstr "Resultatopgørelse/drift"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
@@ -1439,57 +1465,57 @@
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr ""
+msgstr "Søg momsskabelon"
 
 #. module: account
 #: view:account.move.reconcile:0
 #: model:ir.actions.act_window,name:account.action_account_reconcile_select
 #: model:ir.actions.act_window,name:account.action_view_account_move_line_reconcile
 msgid "Reconcile Entries"
-msgstr ""
+msgstr "Udlign posteringer"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr ""
+msgstr "Forfaldne betalinger"
 
 #. module: account
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Initial Balance"
-msgstr ""
+msgstr "Udgangsbalance"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Reset to Draft"
-msgstr ""
+msgstr "Kør tilbage til kladde"
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: view:account.common.report:0
 msgid "Report Options"
-msgstr ""
+msgstr "Rapport optioner"
 
 #. module: account
 #: field:account.fiscalyear.close.state,fy_id:0
 msgid "Fiscal Year to Close"
-msgstr ""
+msgstr "Regnskabsår til lukning"
 
 #. module: account
 #: field:account.config.settings,sale_sequence_prefix:0
 msgid "Invoice sequence"
-msgstr ""
+msgstr "Faktura bilagsnummer"
 
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr ""
+msgstr "Journal posteringer analyse"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
-msgstr ""
+msgstr "Partnere"
 
 #. module: account
 #: help:account.bank.statement,state:0
@@ -1502,16 +1528,26 @@
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice Status"
-msgstr ""
-
-#. module: account
+msgstr "Faktura status"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.open.closed.fiscalyear:0
+#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
+msgid "Cancel Closing Entries"
+msgstr "Fortryd lukningsposteringer"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.bank.statement:0
 #: model:ir.model,name:account.model_account_bank_statement
 #: model:process.node,name:account.process_node_accountingstatemententries0
 #: model:process.node,name:account.process_node_bankstatement0
 #: model:process.node,name:account.process_node_supplierbankstatement0
 msgid "Bank Statement"
-msgstr ""
+msgstr "Bank kontoudtog"
 
 #. module: account
 #: field:res.partner,property_account_receivable:0
@@ -1547,7 +1583,7 @@
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr ""
+msgstr "Søg moms/afgifter"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
@@ -1557,7 +1593,7 @@
 #. module: account
 #: view:account.model:0
 msgid "Create entries"
-msgstr ""
+msgstr "Opret posteringer"
 
 #. module: account
 #: field:account.entries.report,nbr:0
@@ -1567,7 +1603,7 @@
 #. module: account
 #: field:account.automatic.reconcile,max_amount:0
 msgid "Maximum write-off amount"
-msgstr ""
+msgstr "Max. afskrivningsbeløb"
 
 #. module: account
 #. openerp-web
@@ -1595,22 +1631,22 @@
 #: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
-msgstr ""
+msgstr "Ikke implementeret"
 
 #. module: account
 #: view:account.invoice.refund:0
 msgid "Credit Note"
-msgstr ""
+msgstr "Kreditnota"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "eInvoicing & Payments"
-msgstr ""
+msgstr "E-fakturaer og betalinger"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
 msgid "Cost Ledger for Period"
-msgstr ""
+msgstr "Omkostningsregnskab for perioden"
 
 #. module: account
 #: view:account.entries.report:0
@@ -1655,59 +1691,67 @@
 #: selection:account.fiscalyear,state:0
 #: selection:account.period,state:0
 msgid "Closed"
-msgstr ""
+msgstr "Lukket"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_recurrent_entries
 msgid "Recurring Entries"
-msgstr ""
+msgstr "Gentagne posteringer"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
-msgstr ""
+msgstr "Skabelon for finansiel position"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Recurring"
-msgstr ""
-
-#. module: account
+msgstr "Tilbagevendende"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: report:account.invoice:0
+msgid "TIN :"
+msgstr "Moms nr."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.journal,groups_id:0
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #. module: account
 #: field:report.invoice.created,amount_untaxed:0
 msgid "Untaxed"
-msgstr ""
+msgstr "uden moms"
 
 #. module: account
 #: view:account.journal:0
 msgid "Advanced Settings"
-msgstr ""
+msgstr "Udvidede indstillinger"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Search Bank Statements"
-msgstr ""
+msgstr "Søg i bank kontoudtog"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr ""
+msgstr "Ikke-posterede journalposteringer"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_payable:0
 msgid "Payable Account"
-msgstr ""
+msgstr "Kreditor konto"
 
 #. module: account
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr ""
+msgstr "Indgående moms konto"
 
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
@@ -1718,24 +1762,24 @@
 #: view:account.bank.statement:0
 #: field:account.bank.statement,line_ids:0
 msgid "Statement lines"
-msgstr ""
+msgstr "Udtogs linier"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
 msgid "Date/Code"
-msgstr ""
+msgstr "Dato/kode"
 
 #. module: account
 #: field:account.analytic.line,general_account_id:0
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,general_account_id:0
 msgid "General Account"
-msgstr ""
+msgstr "Finans konto"
 
 #. module: account
 #: field:res.partner,debit_limit:0
 msgid "Payable Limit"
-msgstr ""
+msgstr "Betalings max."
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_type_form
@@ -1765,23 +1809,23 @@
 #: model:res.request.link,name:account.req_link_invoice
 #, python-format
 msgid "Invoice"
-msgstr ""
+msgstr "Faktura"
 
 #. module: account
 #: field:account.move,balance:0
 msgid "balance"
-msgstr ""
+msgstr "balance"
 
 #. module: account
 #: model:process.node,note:account.process_node_analytic0
 #: model:process.node,note:account.process_node_analyticcost0
 msgid "Analytic costs to invoice"
-msgstr ""
+msgstr "Analytisk omkostning til fakturering"
 
 #. module: account
 #: view:ir.sequence:0
 msgid "Fiscal Year Sequence"
-msgstr ""
+msgstr "Finansår nummerserie"
 
 #. module: account
 #: field:account.config.settings,group_analytic_accounting:0
@@ -1810,24 +1854,24 @@
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 #: view:report.account_type.sales:0
 msgid "Sales by Account Type"
-msgstr ""
+msgstr "Salg pr. kontotype"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_15days
 #: model:account.payment.term,note:account.account_payment_term_15days
 msgid "15 Days"
-msgstr ""
+msgstr "15 dage"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
-msgstr ""
+msgstr "Fakturering"
 
 #. module: account
 #: code:addons/account/report/account_partner_balance.py:115
 #, python-format
 msgid "Unknown Partner"
-msgstr ""
+msgstr "Ukendt partner"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:103
@@ -1841,12 +1885,12 @@
 #: code:addons/account/account_move_line.py:854
 #, python-format
 msgid "Some entries are already reconciled."
-msgstr ""
+msgstr "Nogle posteringer er allerede udlignet"
 
 #. module: account
 #: field:account.tax.code,sum:0
 msgid "Year Sum"
-msgstr ""
+msgstr "Års sum"
 
 #. module: account
 #: view:account.change.currency:0
@@ -1863,7 +1907,7 @@
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending Accounts"
-msgstr ""
+msgstr "Konti afventende godkendelse"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
@@ -1874,7 +1918,7 @@
 #: report:account.journal.period.print.sale.purchase:0
 #: view:account.tax.template:0
 msgid "Tax Declaration"
-msgstr ""
+msgstr "Moms opgørelse"
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1886,28 +1930,28 @@
 #. module: account
 #: field:account.report.general.ledger,sortby:0
 msgid "Sort by"
-msgstr ""
+msgstr "Sorter efter"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_partner_account_move_all
 msgid "Receivables & Payables"
-msgstr ""
+msgstr "Kreditorer og debitorer"
 
 #. module: account
 #: field:account.config.settings,module_account_payment:0
 msgid "Manage payment orders"
-msgstr ""
+msgstr "Håndtér betalinger"
 
 #. module: account
 #: view:account.period:0
 msgid "Duration"
-msgstr ""
+msgstr "Varighed"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.bank.statement,last_closing_balance:0
 msgid "Last Closing Balance"
-msgstr ""
+msgstr "Sidste afslutningsbalance"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_journal_report
@@ -1917,17 +1961,17 @@
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr ""
+msgstr "Alle partnere"
 
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr ""
+msgstr "Analyse konti oversigter"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Customer Ref:"
-msgstr ""
+msgstr "Kunde ref.:"
 
 #. module: account
 #: help:account.tax,base_code_id:0
@@ -1939,38 +1983,38 @@
 #: help:account.tax.template,ref_tax_code_id:0
 #: help:account.tax.template,tax_code_id:0
 msgid "Use this code for the tax declaration."
-msgstr ""
+msgstr "Brug denne kode for momsopgørelse"
 
 #. module: account
 #: help:account.period,special:0
 msgid "These periods can overlap."
-msgstr ""
+msgstr "Disse perioder kan overlappe."
 
 #. module: account
 #: model:process.node,name:account.process_node_draftstatement0
 msgid "Draft statement"
-msgstr ""
+msgstr "Kladde kontoudtog"
 
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_validated
 msgid "Invoice validated"
-msgstr ""
+msgstr "Faktura godkendt"
 
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
-msgstr ""
+msgstr "Betal dine leverandører pr. check"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
 msgid "Credit amount"
-msgstr ""
+msgstr "Betalings max."
 
 #. module: account
 #: field:account.bank.statement,message_ids:0
 #: field:account.invoice,message_ids:0
 msgid "Messages"
-msgstr ""
+msgstr "Beskeder"
 
 #. module: account
 #: view:account.vat.declaration:0
@@ -2037,7 +2081,7 @@
 #: code:addons/account/wizard/pos_box.py:35
 #, python-format
 msgid "Error!"
-msgstr ""
+msgstr "Fejl!"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree2
@@ -2063,17 +2107,17 @@
 #: model:ir.actions.act_window,name:account.action_account_invoice_report_all
 #: model:ir.ui.menu,name:account.menu_action_account_invoice_report_all
 msgid "Invoices Analysis"
-msgstr ""
+msgstr "Faktura analyse"
 
 #. module: account
 #: model:ir.model,name:account.model_mail_compose_message
 msgid "Email composition wizard"
-msgstr ""
+msgstr "Wizard til at skrive Email"
 
 #. module: account
 #: model:ir.model,name:account.model_account_period_close
 msgid "period close"
-msgstr ""
+msgstr "Periode afslutning"
 
 #. module: account
 #: code:addons/account/account.py:1058
@@ -2086,12 +2130,12 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_project_account_analytic_line_form
 msgid "Entries By Line"
-msgstr ""
+msgstr "Posteringer pr. linie"
 
 #. module: account
 #: field:account.vat.declaration,based_on:0
 msgid "Based on"
-msgstr ""
+msgstr "Baseret på"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_bank_statement_tree
@@ -2114,19 +2158,19 @@
 #. module: account
 #: field:account.config.settings,currency_id:0
 msgid "Default company currency"
-msgstr ""
+msgstr "Standard firma valuta"
 
 #. module: account
 #: field:account.invoice,move_id:0
 #: field:account.invoice,move_name:0
 #: field:account.move.line,move_id:0
 msgid "Journal Entry"
-msgstr ""
+msgstr "Postering"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Unpaid"
-msgstr ""
+msgstr "Ubetalt"
 
 #. module: account
 #: view:account.treasury.report:0
@@ -2134,18 +2178,18 @@
 #: model:ir.model,name:account.model_account_treasury_report
 #: model:ir.ui.menu,name:account.menu_action_account_treasury_report_all
 msgid "Treasury Analysis"
-msgstr ""
+msgstr "Skatte analyse"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_journal_sale_purchase
 msgid "Sale/Purchase Journal"
-msgstr ""
+msgstr "Salgs-/indkøbs journal"
 
 #. module: account
 #: view:account.analytic.account:0
 #: field:account.invoice.tax,account_analytic_id:0
 msgid "Analytic account"
-msgstr ""
+msgstr "Analytisk konto"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:406
@@ -2156,24 +2200,24 @@
 #. module: account
 #: selection:account.entries.report,move_line_state:0
 msgid "Valid"
-msgstr ""
+msgstr "Gyldig"
 
 #. module: account
 #: field:account.bank.statement,message_follower_ids:0
 #: field:account.invoice,message_follower_ids:0
 msgid "Followers"
-msgstr ""
+msgstr "Followers"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_journal
 #: model:ir.model,name:account.model_account_print_journal
 msgid "Account Print Journal"
-msgstr ""
+msgstr "Print konto journal"
 
 #. module: account
 #: model:ir.model,name:account.model_product_category
 msgid "Product Category"
-msgstr ""
+msgstr "Produkt katagori"
 
 #. module: account
 #: code:addons/account/account.py:656
@@ -2186,19 +2230,19 @@
 #. module: account
 #: model:ir.model,name:account.model_account_aged_trial_balance
 msgid "Account Aged Trial balance Report"
-msgstr ""
+msgstr "Aldersopdelt råbalance"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscal Year"
-msgstr ""
+msgstr "Luk regnskabsår"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
 #, python-format
 msgid "Journal :"
-msgstr ""
+msgstr "Journal"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
@@ -2209,7 +2253,7 @@
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr ""
+msgstr "Moms definition"
 
 #. module: account
 #: view:account.config.settings:0
@@ -2220,7 +2264,7 @@
 #. module: account
 #: field:account.invoice.report,uom_name:0
 msgid "Reference Unit of Measure"
-msgstr ""
+msgstr "Reference enhed"
 
 #. module: account
 #: help:account.journal,allow_date:0
@@ -2234,12 +2278,12 @@
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:8
 #, python-format
 msgid "Good job!"
-msgstr ""
+msgstr "Godt gået!"
 
 #. module: account
 #: field:account.config.settings,module_account_asset:0
 msgid "Assets management"
-msgstr ""
+msgstr "Styring af aktiver"
 
 #. module: account
 #: view:account.account:0
@@ -2253,7 +2297,7 @@
 #: code:addons/account/report/account_partner_ledger.py:274
 #, python-format
 msgid "Payable Accounts"
-msgstr ""
+msgstr "Leverandør konti"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -2267,7 +2311,7 @@
 #: view:account.invoice:0
 #: view:report.invoice.created:0
 msgid "Untaxed Amount"
-msgstr ""
+msgstr "Beløb før moms"
 
 #. module: account
 #: help:account.tax,active:0
@@ -2279,7 +2323,7 @@
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr ""
+msgstr "Analytiske posteringer relateret til salgs-journal"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -2304,18 +2348,18 @@
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
 msgid "Draft"
-msgstr ""
+msgstr "Kladde"
 
 #. module: account
 #: field:account.move.reconcile,line_partial_ids:0
 msgid "Partial Entry lines"
-msgstr ""
+msgstr "Delvise indtastninger"
 
 #. module: account
 #: view:account.fiscalyear:0
 #: field:account.treasury.report,fiscalyear_id:0
 msgid "Fiscalyear"
-msgstr ""
+msgstr "Regnskabsår"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
@@ -2327,17 +2371,17 @@
 #: view:account.journal.select:0
 #: view:project.account.analytic.line:0
 msgid "Open Entries"
-msgstr ""
+msgstr "Åbne posteringer"
 
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_next:0
 msgid "Next supplier credit note number"
-msgstr ""
+msgstr "Næste leverandør kreditnota nummer"
 
 #. module: account
 #: field:account.automatic.reconcile,account_ids:0
 msgid "Accounts to Reconcile"
-msgstr ""
+msgstr "Konti til udligning/afstemning"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_filestatement0
@@ -2347,7 +2391,7 @@
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr ""
+msgstr "Import fra faktura"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2356,23 +2400,23 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "This F.Year"
-msgstr ""
+msgstr "Dette finansår"
 
 #. module: account
 #: view:account.tax.chart:0
 msgid "Account tax charts"
-msgstr ""
+msgstr "Momsoversigt konto"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_net
 #: model:account.payment.term,note:account.account_payment_term_net
 msgid "30 Net Days"
-msgstr ""
+msgstr "30 dage netto"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:256
@@ -2391,7 +2435,7 @@
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Pro-forma"
-msgstr ""
+msgstr "Proforma"
 
 #. module: account
 #: help:account.account.template,type:0
@@ -2407,12 +2451,12 @@
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
-msgstr ""
+msgstr "Søg i konto-oversigter"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Customer Code"
-msgstr ""
+msgstr "Kundekode"
 
 #. module: account
 #: view:account.account.type:0
@@ -2429,26 +2473,26 @@
 #: field:analytic.entries.report,name:0
 #: field:report.invoice.created,name:0
 msgid "Description"
-msgstr ""
+msgstr "Beskrivelse"
 
 #. module: account
 #: field:account.tax,price_include:0
 #: field:account.tax.template,price_include:0
 msgid "Tax Included in Price"
-msgstr ""
+msgstr "Moms inkluderet i prisen"
 
 #. module: account
 #: view:account.subscription:0
 #: selection:account.subscription,state:0
 msgid "Running"
-msgstr ""
+msgstr "Kører"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr ""
+msgstr "Omsætnings konto"
 
 #. module: account
 #: help:account.config.settings,default_sale_tax:0
@@ -2460,12 +2504,12 @@
 #: report:account.journal.period.print:0
 #: report:account.journal.period.print.sale.purchase:0
 msgid "Entries Sorted By"
-msgstr ""
+msgstr "Posteringer sorteret efter"
 
 #. module: account
 #: field:account.change.currency,currency_id:0
 msgid "Change to"
-msgstr ""
+msgstr "Ændre til"
 
 #. module: account
 #: view:account.entries.report:0
@@ -2475,7 +2519,7 @@
 #. module: account
 #: model:ir.model,name:account.model_product_template
 msgid "Product Template"
-msgstr ""
+msgstr "Produktskabelon"
 
 #. module: account
 #: report:account.account.balance:0
@@ -2515,7 +2559,7 @@
 #: field:accounting.report,fiscalyear_id_cmp:0
 #: model:ir.model,name:account.model_account_fiscalyear
 msgid "Fiscal Year"
-msgstr ""
+msgstr "Finans år"
 
 #. module: account
 #: help:account.aged.trial.balance,fiscalyear_id:0
@@ -2552,7 +2596,7 @@
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Create an Account Based on this Template"
-msgstr ""
+msgstr "Opret en konto med udgangspunkt i denne skabelon"
 
 #. module: account
 #: code:addons/account/account_invoice.py:933
@@ -2568,12 +2612,12 @@
 #: view:account.move:0
 #: model:ir.model,name:account.model_account_move
 msgid "Account Entry"
-msgstr ""
+msgstr "Konto indtastning"
 
 #. module: account
 #: field:account.sequence.fiscalyear,sequence_main_id:0
 msgid "Main Sequence"
-msgstr ""
+msgstr "Hovedrækkefølge"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:478
@@ -2591,13 +2635,13 @@
 #: field:account.payment.term.line,payment_id:0
 #: model:ir.model,name:account.model_account_payment_term
 msgid "Payment Term"
-msgstr ""
+msgstr "Betalingsbetingelse"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
-msgstr ""
+msgstr "Regnskabs positioner"
 
 #. module: account
 #: code:addons/account/account_move_line.py:579
@@ -2613,13 +2657,13 @@
 #. module: account
 #: view:account.common.report:0
 msgid "Filters"
-msgstr ""
+msgstr "Filtre"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftinvoices0
 #: model:process.node,note:account.process_node_supplierdraftinvoices0
 msgid "Draft state of an invoice"
-msgstr ""
+msgstr "Faktura i kladde-stadie"
 
 #. module: account
 #: view:product.category:0
@@ -2629,17 +2673,17 @@
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft refund"
-msgstr ""
+msgstr "Opret en kladde-kreditnota"
 
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr ""
+msgstr "Partner afstemning"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Fin. Account"
-msgstr ""
+msgstr "Finanskonto"
 
 #. module: account
 #: field:account.tax,tax_code_id:0
@@ -2656,7 +2700,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "Unreconciled entries"
-msgstr ""
+msgstr "Ikke-udlignede posteringer"
 
 #. module: account
 #: field:account.invoice.tax,base_code_id:0
@@ -2686,7 +2730,7 @@
 #: view:account.invoice.confirm:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_confirm
 msgid "Confirm Draft Invoices"
-msgstr ""
+msgstr "Godkend fakturakladder"
 
 #. module: account
 #: field:account.entries.report,day:0
@@ -2695,12 +2739,12 @@
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,day:0
 msgid "Day"
-msgstr ""
+msgstr "Dag"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_renew_view
 msgid "Accounts to Renew"
-msgstr ""
+msgstr "Konti der skal fornys"
 
 #. module: account
 #: model:ir.model,name:account.model_account_model_line
@@ -2721,7 +2765,7 @@
 #. module: account
 #: view:res.partner:0
 msgid "Bank Details"
-msgstr ""
+msgstr "Bankoplysninger"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_move_journal_line
@@ -2760,7 +2804,7 @@
 #. module: account
 #: field:account.config.settings,purchase_sequence_next:0
 msgid "Next supplier invoice number"
-msgstr ""
+msgstr "Næste leverandør fakturanummer"
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -2770,7 +2814,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_pp_statements
 msgid "Statements"
-msgstr ""
+msgstr "Kontoudtog"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -2791,7 +2835,7 @@
 #: view:account.tax:0
 #: model:ir.model,name:account.model_account_tax
 msgid "Tax"
-msgstr ""
+msgstr "Moms"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2803,13 +2847,13 @@
 #: field:account.move.line,analytic_account_id:0
 #: field:account.move.line.reconcile.writeoff,analytic_id:0
 msgid "Analytic Account"
-msgstr ""
+msgstr "Analyse konto"
 
 #. module: account
 #: field:account.config.settings,default_purchase_tax:0
 #: field:account.config.settings,purchase_tax:0
 msgid "Default purchase tax"
-msgstr ""
+msgstr "Standard indkøbsmoms"
 
 #. module: account
 #: view:account.account:0
@@ -2822,7 +2866,7 @@
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr ""
+msgstr "Konti"
 
 #. module: account
 #: code:addons/account/account.py:3541
@@ -2835,7 +2879,7 @@
 #: code:addons/account/account_move_line.py:536
 #, python-format
 msgid "Configuration Error!"
-msgstr ""
+msgstr "Konfigurationsfejl!"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:434
@@ -2847,7 +2891,7 @@
 #: field:account.invoice.report,price_average:0
 #: field:account.invoice.report,user_currency_price_average:0
 msgid "Average Price"
-msgstr ""
+msgstr "Gennemsnits pris"
 
 #. module: account
 #: report:account.overdue:0
@@ -2894,7 +2938,7 @@
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Purchase Tax"
-msgstr ""
+msgstr "Indkøbs moms"
 
 #. module: account
 #: help:account.move.line,tax_code_id:0
@@ -2915,7 +2959,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_automatic_reconcile
 msgid "Automatic Reconciliation"
-msgstr ""
+msgstr "Automatisk udligning"
 
 #. module: account
 #: field:account.invoice,reconciled:0
@@ -2932,7 +2976,7 @@
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
 #: model:ir.ui.menu,name:account.menu_bank_statement_tree
 msgid "Bank Statements"
-msgstr ""
+msgstr "Bank kontoudtog"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_fiscalyear
@@ -2960,25 +3004,25 @@
 #: view:account.move.line:0
 #: view:accounting.report:0
 msgid "Dates"
-msgstr ""
+msgstr "Datoer"
 
 #. module: account
 #: field:account.chart.template,parent_id:0
 msgid "Parent Chart Template"
-msgstr ""
+msgstr "Hoved skabelon"
 
 #. module: account
 #: field:account.tax,parent_id:0
 #: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
-msgstr ""
+msgstr "Hoved momskonto"
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr ""
+msgstr "Aldersopdelt partner balance"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
@@ -3009,13 +3053,13 @@
 #. module: account
 #: field:account.move.line.reconcile,writeoff:0
 msgid "Write-Off amount"
-msgstr ""
+msgstr "Tab/vind konto"
 
 #. module: account
 #: field:account.bank.statement,message_unread:0
 #: field:account.invoice,message_unread:0
 msgid "Unread Messages"
-msgstr ""
+msgstr "Ulæste beskeder"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:44
@@ -3036,7 +3080,7 @@
 #: view:report.account.sales:0
 #: view:report.account_type.sales:0
 msgid "Sales by Account"
-msgstr ""
+msgstr "Salg pr. konto"
 
 #. module: account
 #: code:addons/account/account.py:1449
@@ -3052,7 +3096,7 @@
 #. module: account
 #: field:account.config.settings,sale_journal_id:0
 msgid "Sale journal"
-msgstr ""
+msgstr "Salgs journal"
 
 #. module: account
 #: code:addons/account/account.py:2346
@@ -3082,12 +3126,12 @@
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr ""
+msgstr "Moms koder"
 
 #. module: account
 #: view:account.account:0
 msgid "Unrealized Gains and losses"
-msgstr ""
+msgstr "Urealisterede tab/vind"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_customer
@@ -3109,21 +3153,29 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "August"
-msgstr ""
+msgstr "August"
 
 #. module: account
 #: field:accounting.report,debit_credit:0
 msgid "Display Debit/Credit Columns"
-msgstr ""
-
-#. module: account
+msgstr "Vis debit/kredit kolonner"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: report:account.journal.period.print:0
+msgid "Reference Number"
+msgstr "Referencenummer"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.entries.report,month:0
 #: selection:account.invoice.report,month:0
 #: selection:analytic.entries.report,month:0
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #. module: account
 #: help:account.move.line,quantity:0
@@ -3136,7 +3188,7 @@
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile Transactions"
-msgstr ""
+msgstr "Fjern udligning fra transaktioner"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3148,13 +3200,13 @@
 #: field:product.category,property_account_expense_categ:0
 #: field:product.template,property_account_expense:0
 msgid "Expense Account"
-msgstr ""
+msgstr "Udgifts konto"
 
 #. module: account
 #: field:account.bank.statement,message_summary:0
 #: field:account.invoice,message_summary:0
 msgid "Summary"
-msgstr ""
+msgstr "Sammendrag"
 
 #. module: account
 #: help:account.invoice,period_id:0
@@ -3180,7 +3232,7 @@
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax:0
 msgid "Default Sale Tax"
-msgstr ""
+msgstr "Standard salgsmoms"
 
 #. module: account
 #: help:account.model.line,date_maturity:0
@@ -3198,7 +3250,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report_pl
 msgid "Profit And Loss"
-msgstr ""
+msgstr "Tab & vind"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -3212,7 +3264,7 @@
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr "Nuværende position"
+msgstr "Momskode"
 
 #. module: account
 #: code:addons/account/account_invoice.py:823
@@ -3231,7 +3283,7 @@
 #: field:account.account,child_parent_ids:0
 #: field:account.account.template,child_parent_ids:0
 msgid "Children"
-msgstr ""
+msgstr "Under-konti"
 
 #. module: account
 #: report:account.account.balance:0
@@ -3239,7 +3291,7 @@
 #: model:ir.actions.report.xml,name:account.account_account_balance
 #: model:ir.ui.menu,name:account.menu_general_Balance_report
 msgid "Trial Balance"
-msgstr ""
+msgstr "Råbalance"
 
 #. module: account
 #: code:addons/account/account.py:431
@@ -3264,23 +3316,23 @@
 #: view:account.config.settings:0
 #: view:account.installer:0
 msgid "Date Range"
-msgstr ""
+msgstr "Datointerval"
 
 #. module: account
 #: view:account.period:0
 msgid "Search Period"
-msgstr ""
+msgstr "Søg periode"
 
 #. module: account
 #: view:account.change.currency:0
 msgid "Invoice Currency"
-msgstr ""
+msgstr "Faktura valuta"
 
 #. module: account
 #: field:accounting.report,account_report_id:0
 #: model:ir.ui.menu,name:account.menu_account_financial_reports_tree
 msgid "Account Reports"
-msgstr ""
+msgstr "Konto rapporter"
 
 #. module: account
 #: field:account.payment.term,line_ids:0
@@ -3290,12 +3342,12 @@
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr ""
+msgstr "Moms skabelon liste"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
 msgid "Sale/Purchase Journals"
-msgstr ""
+msgstr "Salgs/indkøbs journaler"
 
 #. module: account
 #: help:account.account,currency_mode:0
@@ -3328,17 +3380,17 @@
 #. module: account
 #: field:res.partner,property_supplier_payment_term:0
 msgid "Supplier Payment Term"
-msgstr ""
+msgstr "Leverandør betalingsbetingelse"
 
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Search Fiscalyear"
-msgstr ""
+msgstr "Søg regnskabsår"
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Always"
-msgstr ""
+msgstr "Altid"
 
 #. module: account
 #: field:account.config.settings,module_account_accountant:0
@@ -3349,12 +3401,12 @@
 #. module: account
 #: view:account.analytic.line:0
 msgid "Total Quantity"
-msgstr ""
+msgstr "Total antal/sum"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,writeoff_acc_id:0
 msgid "Write-Off account"
-msgstr ""
+msgstr "Tab/Vind konto"
 
 #. module: account
 #: field:account.model.line,model_id:0
@@ -3391,32 +3443,32 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "Proforma fakturaer"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
 msgid "Electronic File"
-msgstr ""
+msgstr "Elektronisk fil/arkiv"
 
 #. module: account
 #: field:account.move.line,reconcile:0
 msgid "Reconcile Ref"
-msgstr ""
+msgstr "Udlignings-reference"
 
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
-msgstr ""
+msgstr "Firma har en kontoplan"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr ""
+msgstr "Momskode skabelon"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr ""
+msgstr "Partner finans konto"
 
 #. module: account
 #: model:email.template,body_html:account.email_template_edi_invoice
@@ -3506,7 +3558,7 @@
 #. module: account
 #: view:account.period:0
 msgid "Account Period"
-msgstr ""
+msgstr "Konto periode"
 
 #. module: account
 #: help:account.account,currency_id:0
@@ -3526,12 +3578,12 @@
 #: model:ir.actions.act_window,name:account.action_account_chart_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_chart_template_form
 msgid "Chart of Accounts Templates"
-msgstr ""
+msgstr "Kontoplan skabeloner"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Transactions"
-msgstr ""
+msgstr "Transaktioner"
 
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile_reconcile
@@ -3589,12 +3641,12 @@
 #: model:ir.ui.menu,name:account.menu_journals
 #: model:ir.ui.menu,name:account.menu_journals_report
 msgid "Journals"
-msgstr ""
+msgstr "Journaler"
 
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr ""
+msgstr "Tilbageværende partnere"
 
 #. module: account
 #: view:account.subscription:0
@@ -3623,7 +3675,7 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_vat_declaration
 msgid "Account Tax Declaration"
-msgstr ""
+msgstr "konto momsopgørelse"
 
 #. module: account
 #: help:account.bank.statement,name:0
@@ -3646,26 +3698,26 @@
 #: field:account.bank.statement,balance_start:0
 #: field:account.treasury.report,starting_balance:0
 msgid "Starting Balance"
-msgstr ""
+msgstr "Opstarts balance"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1465
 #, python-format
 msgid "No Partner Defined !"
-msgstr ""
+msgstr "Ingen partner angivet"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_close
 #: model:ir.actions.act_window,name:account.action_account_period_tree
 #: model:ir.ui.menu,name:account.menu_action_account_period_close_tree
 msgid "Close a Period"
-msgstr ""
+msgstr "Luk en periode"
 
 #. module: account
 #: view:account.bank.statement:0
 #: field:account.cashbox.line,subtotal_opening:0
 msgid "Opening Subtotal"
-msgstr ""
+msgstr "Åbnings subtotal"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -3677,12 +3729,12 @@
 #. module: account
 #: field:account.financial.report,display_detail:0
 msgid "Display details"
-msgstr ""
+msgstr "Vis detaljer"
 
 #. module: account
 #: report:account.overdue:0
 msgid "VAT:"
-msgstr ""
+msgstr "Moms"
 
 #. module: account
 #: help:account.analytic.line,amount_currency:0
@@ -3715,40 +3767,40 @@
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_reconcile
 #: model:ir.actions.act_window,name:account.action_account_unreconcile_select
 msgid "Unreconcile Entries"
-msgstr ""
+msgstr "Uudlignede posteringer"
 
 #. module: account
 #: field:account.tax.code,notprintable:0
 #: field:account.tax.code.template,notprintable:0
 msgid "Not Printable in Invoice"
-msgstr ""
+msgstr "Ingen faktura der kan printes"
 
 #. module: account
 #: report:account.vat.declaration:0
 #: field:account.vat.declaration,chart_tax_id:0
 msgid "Chart of Tax"
-msgstr ""
+msgstr "moms oversigt"
 
 #. module: account
 #: view:account.journal:0
 msgid "Search Account Journal"
-msgstr ""
+msgstr "Søg konto journal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree_pending_invoice
 msgid "Pending Invoice"
-msgstr ""
+msgstr "Afventende faktura"
 
 #. module: account
 #: view:account.invoice.report:0
 #: selection:account.subscription,period_type:0
 msgid "year"
-msgstr ""
+msgstr "år"
 
 #. module: account
 #: field:account.config.settings,date_start:0
 msgid "Start date"
-msgstr ""
+msgstr "Startdato"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -3778,7 +3830,7 @@
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
 msgid "Transfers"
-msgstr ""
+msgstr "Overførsler"
 
 #. module: account
 #: field:account.config.settings,expects_chart_of_accounts:0
@@ -3788,7 +3840,7 @@
 #. module: account
 #: view:account.chart:0
 msgid "Account charts"
-msgstr ""
+msgstr "Konto oversigter"
 
 #. module: account
 #: view:cash.box.out:0
@@ -3799,7 +3851,7 @@
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Amount"
-msgstr ""
+msgstr "Momsbeløb"
 
 #. module: account
 #: view:account.move:0
@@ -3836,17 +3888,17 @@
 #: view:account.invoice:0
 #: model:process.node,name:account.process_node_draftinvoices0
 msgid "Draft Invoice"
-msgstr ""
+msgstr "Proforma faktura"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "Options"
-msgstr ""
+msgstr "Optioner"
 
 #. module: account
 #: field:account.aged.trial.balance,period_length:0
 msgid "Period Length (days)"
-msgstr ""
+msgstr "Perilde længde (dage)"
 
 #. module: account
 #: code:addons/account/account.py:1363
@@ -3859,7 +3911,7 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
 msgid "Print Sale/Purchase Journal"
-msgstr ""
+msgstr "Udskriv salgs-/indkøbs journal"
 
 #. module: account
 #: view:account.installer:0
@@ -3870,7 +3922,7 @@
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Produkt kategori"
 
 #. module: account
 #: code:addons/account/account.py:930
@@ -3884,7 +3936,7 @@
 #: view:account.addtmpl.wizard:0
 #: model:ir.actions.act_window,name:account.action_account_addtmpl_wizard_form
 msgid "Create Account"
-msgstr ""
+msgstr "Opret konto"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
@@ -3895,17 +3947,17 @@
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr ""
+msgstr "Momskode beløb"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr ""
+msgstr "Uudlignede posteringer"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 msgid "Detail"
-msgstr ""
+msgstr "Detalje"
 
 #. module: account
 #: help:account.config.settings,default_purchase_tax:0
@@ -3947,7 +3999,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr ""
+msgstr "Udlignings proces partner for partner"
 
 #. module: account
 #: view:account.chart:0
@@ -3994,7 +4046,7 @@
 #: selection:accounting.report,filter_cmp:0
 #: field:analytic.entries.report,date:0
 msgid "Date"
-msgstr ""
+msgstr "Dato"
 
 #. module: account
 #: view:account.move:0
@@ -4005,12 +4057,12 @@
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile"
-msgstr ""
+msgstr "Fjern udligning"
 
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr ""
+msgstr "Kontooversigt skabelon"
 
 #. module: account
 #: code:addons/account/account.py:2358
@@ -4035,7 +4087,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
 msgid "Budgets"
-msgstr ""
+msgstr "Budgetter"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -4054,18 +4106,18 @@
 #: selection:accounting.report,filter:0
 #: selection:accounting.report,filter_cmp:0
 msgid "No Filters"
-msgstr ""
+msgstr "Ingen filtre"
 
 #. module: account
 #: view:account.invoice.report:0
 #: model:res.groups,name:account.group_proforma_invoices
 msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "proforma fakturaer"
 
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Historik"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -4097,7 +4149,7 @@
 #: view:account.invoice.report:0
 #: field:account.invoice.report,product_qty:0
 msgid "Qty"
-msgstr ""
+msgstr "Antal"
 
 #. module: account
 #: help:account.tax.code,sign:0
@@ -4115,7 +4167,7 @@
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr ""
+msgstr "Kreditor"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
@@ -4126,7 +4178,7 @@
 #. module: account
 #: model:process.node,name:account.process_node_supplierpaymentorder0
 msgid "Payment Order"
-msgstr ""
+msgstr "Betalings ordre"
 
 #. module: account
 #: help:account.account.template,reconcile:0
@@ -4153,19 +4205,27 @@
 #. module: account
 #: view:account.state.open:0
 msgid "Open Invoice"
-msgstr ""
+msgstr "Åben faktura"
 
 #. module: account
 #: field:account.invoice.tax,factor_tax:0
 msgid "Multipication factor Tax code"
-msgstr ""
+msgstr "Multiplikationsfaktor for moms"
 
 #. module: account
 #: field:account.config.settings,complete_tax_set:0
 msgid "Complete set of taxes"
-msgstr ""
-
-#. module: account
+msgstr "Komplet sæt momskoder"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Full Reconciliation Date"
+msgstr "Seneste komplet udligningsdato"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.account,name:0
 #: field:account.account.template,name:0
 #: report:account.analytic.account.inverted.balance:0
@@ -4175,7 +4235,7 @@
 #: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
-msgstr ""
+msgstr "Navn"
 
 #. module: account
 #: code:addons/account/installer.py:115
@@ -4191,7 +4251,7 @@
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr ""
+msgstr "Ikrafttrædelses dato"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:100
@@ -4208,18 +4268,18 @@
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
-msgstr ""
+msgstr "Partner ID"
 
 #. module: account
 #: help:account.bank.statement,message_ids:0
 #: help:account.invoice,message_ids:0
 msgid "Messages and communication history"
-msgstr ""
+msgstr "Besked- og kommunikations historik"
 
 #. module: account
 #: help:account.journal,analytic_journal_id:0
 msgid "Journal for analytic entries"
-msgstr ""
+msgstr "Journal for analytiske posteringer"
 
 #. module: account
 #: constraint:account.aged.trial.balance:0
@@ -4284,7 +4344,7 @@
 #: code:addons/account/wizard/account_invoice_refund.py:146
 #, python-format
 msgid "Insufficient Data!"
-msgstr ""
+msgstr "Utilstrækkelige data!"
 
 #. module: account
 #: help:account.account,unrealized_gain_loss:0
@@ -4310,33 +4370,33 @@
 #. module: account
 #: view:account.installer:0
 msgid "title"
-msgstr ""
+msgstr "titel"
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.subscription:0
 msgid "Set to Draft"
-msgstr ""
+msgstr "Sæt til udkast"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form
 msgid "Recurring Lines"
-msgstr ""
+msgstr "Gentagne linier"
 
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr ""
+msgstr "Vis partnere"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Validate"
-msgstr ""
+msgstr "Validér"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_assets0
 msgid "Assets"
-msgstr ""
+msgstr "Aktiver"
 
 #. module: account
 #: view:account.config.settings:0
@@ -4346,19 +4406,19 @@
 #. module: account
 #: view:account.invoice.confirm:0
 msgid "Confirm Invoices"
-msgstr ""
+msgstr "Bekræft fakturaer"
 
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "Average Rate"
-msgstr ""
+msgstr "Gennemsnits rate"
 
 #. module: account
 #: field:account.balance.report,display_account:0
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr ""
+msgstr "Vis konti"
 
 #. module: account
 #: view:account.state.open:0
@@ -4368,25 +4428,25 @@
 #. module: account
 #: field:account.tax,account_analytic_collected_id:0
 msgid "Invoice Tax Analytic Account"
-msgstr ""
+msgstr "Faktura moms analyse konto"
 
 #. module: account
 #: field:account.chart,period_from:0
 msgid "Start period"
-msgstr ""
+msgstr "Start periode"
 
 #. module: account
 #: field:account.tax,name:0
 #: field:account.tax.template,name:0
 #: report:account.vat.declaration:0
 msgid "Tax Name"
-msgstr ""
+msgstr "Moms navn"
 
 #. module: account
 #: view:account.config.settings:0
 #: model:ir.ui.menu,name:account.menu_finance_configuration
 msgid "Configuration"
-msgstr ""
+msgstr "Konfiguration"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term
@@ -4398,7 +4458,7 @@
 #: model:ir.actions.act_window,name:account.action_account_analytic_balance
 #: model:ir.actions.report.xml,name:account.account_analytic_account_balance
 msgid "Analytic Balance"
-msgstr ""
+msgstr "Analytisk balance"
 
 #. module: account
 #: help:res.partner,property_payment_term:0
@@ -4424,7 +4484,7 @@
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr ""
+msgstr "Registrerede posteringer"
 
 #. module: account
 #: field:account.move.line,blocked:0
@@ -4434,12 +4494,12 @@
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr ""
+msgstr "Søg moms skabeloner"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
 msgid "Draft Entries"
-msgstr ""
+msgstr "Kladde indtastninger"
 
 #. module: account
 #: help:account.config.settings,decimal_precision:0
@@ -4453,7 +4513,7 @@
 #: field:account.account,shortcut:0
 #: field:account.account.template,shortcut:0
 msgid "Shortcut"
-msgstr ""
+msgstr "Genvej"
 
 #. module: account
 #: view:account.account:0
@@ -4469,7 +4529,7 @@
 #: field:report.account.receivable,type:0
 #: field:report.account_type.sales,user_type:0
 msgid "Account Type"
-msgstr ""
+msgstr "Kontotype"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4511,6 +4571,34 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr "Fortryd valgte fakturaer"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:424
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr ""
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr ""
+"Analytiske omkostninger (tidsskemaer, nogle købte varer..) stammer fra "
+"analytiske konti. Disse danner kladde leverandør fakturaer."
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: constraint:account.tax.code.template:0
 msgid ""
 "Error!\n"
@@ -4533,7 +4621,7 @@
 #: field:report.account.sales,month:0
 #: field:report.account_type.sales,month:0
 msgid "Month"
-msgstr ""
+msgstr "Måned"
 
 #. module: account
 #: code:addons/account/account.py:668
@@ -4544,7 +4632,7 @@
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
 msgid "Supplier invoice sequence"
-msgstr ""
+msgstr "Leverandør faktura bilagsrække"
 
 #. module: account
 #: code:addons/account/account_invoice.py:610
@@ -4560,27 +4648,27 @@
 #: view:analytic.entries.report:0
 #: field:analytic.entries.report,product_uom_id:0
 msgid "Product Unit of Measure"
-msgstr ""
+msgstr "Vare enhed"
 
 #. module: account
 #: field:res.company,paypal_account:0
 msgid "Paypal Account"
-msgstr ""
+msgstr "Paypal konto"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr ""
+msgstr "Konto type"
 
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Checks"
-msgstr ""
+msgstr "Bank og checks"
 
 #. module: account
 #: field:account.account.template,note:0
 msgid "Note"
-msgstr ""
+msgstr "Notat"
 
 #. module: account
 #: selection:account.financial.report,sign:0
@@ -4592,7 +4680,7 @@
 #: code:addons/account/account.py:191
 #, python-format
 msgid "Balance Sheet (Liability account)"
-msgstr ""
+msgstr "Balance (Gælds konto)"
 
 #. module: account
 #: help:account.invoice,date_invoice:0
@@ -4603,7 +4691,7 @@
 #: view:account.bank.statement:0
 #: field:account.cashbox.line,subtotal_closing:0
 msgid "Closing Subtotal"
-msgstr ""
+msgstr "Luknings subtotal"
 
 #. module: account
 #: field:account.tax,base_code_id:0
@@ -4642,12 +4730,12 @@
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr ""
+msgstr "Alle bogførte posteringer"
 
 #. module: account
 #: field:report.aged.receivable,name:0
 msgid "Month Range"
-msgstr ""
+msgstr "Måneds interval"
 
 #. module: account
 #: help:account.analytic.balance,empty_acc:0
@@ -4657,7 +4745,7 @@
 #. module: account
 #: field:account.move.reconcile,opening_reconciliation:0
 msgid "Opening Entries Reconciliation"
-msgstr ""
+msgstr "Udligninger på åbningsposteringer"
 
 #. module: account
 #. openerp-web
@@ -4674,7 +4762,7 @@
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
 msgid "Statement from invoice or payment"
-msgstr ""
+msgstr "Kontoudtog fra faktura eller betaling"
 
 #. module: account
 #: code:addons/account/installer.py:115
@@ -4685,19 +4773,28 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Add an internal note..."
+msgstr "Tilføj en intern note"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Angiv konto optioner"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
-msgstr ""
+msgstr "Konto oversigt"
 
 #. module: account
 #: field:account.invoice,reference_type:0
 msgid "Payment Reference"
-msgstr ""
+msgstr "Betalings reference"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -4708,7 +4805,7 @@
 #: report:account.analytic.account.balance:0
 #: report:account.central.journal:0
 msgid "Account Name"
-msgstr ""
+msgstr "Kontonavn"
 
 #. module: account
 #: help:account.fiscalyear.close,report_name:0
@@ -4718,12 +4815,12 @@
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_report
 msgid "Invoices Statistics"
-msgstr ""
+msgstr "Faktura statistik"
 
 #. module: account
 #: field:account.account,exchange_rate:0
 msgid "Exchange Rate"
-msgstr ""
+msgstr "Omregnings kurs"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderreconcilation0
@@ -4734,18 +4831,18 @@
 #: code:addons/account/wizard/account_reconcile.py:122
 #, python-format
 msgid "Reconcile Writeoff"
-msgstr ""
+msgstr "Udlign afskrivninger"
 
 #. module: account
 #: view:account.account.template:0
 #: view:account.chart.template:0
 msgid "Account Template"
-msgstr ""
+msgstr "Konto skabelon"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Closing Balance"
-msgstr ""
+msgstr "Luknings balance"
 
 #. module: account
 #: field:account.chart.template,visible:0
@@ -4760,18 +4857,18 @@
 #. module: account
 #: view:account.tax.template:0
 msgid "Credit Notes"
-msgstr ""
+msgstr "Kreditnotaer"
 
 #. module: account
 #: view:account.move.line:0
 #: model:ir.actions.act_window,name:account.action_account_manual_reconcile
 msgid "Journal Items to Reconcile"
-msgstr ""
+msgstr "Posteringer til udligning"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_template
 msgid "Templates for Taxes"
-msgstr ""
+msgstr "Moms skabeloner"
 
 #. module: account
 #: sql_constraint:account.period:0
@@ -4786,7 +4883,7 @@
 #. module: account
 #: view:account.tax:0
 msgid "Tax Computation"
-msgstr ""
+msgstr "Moms beregning"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4811,7 +4908,7 @@
 #: field:account.account,reconcile:0
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr ""
+msgstr "Tillad udligning"
 
 #. module: account
 #: constraint:account.account:0
@@ -4833,7 +4930,7 @@
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Based On"
-msgstr ""
+msgstr "Baseret på"
 
 #. module: account
 #: code:addons/account/account.py:3204
@@ -4881,7 +4978,7 @@
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Cancelled"
-msgstr ""
+msgstr "Annulleret"
 
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
@@ -4905,19 +5002,19 @@
 #: code:addons/account/account.py:3394
 #, python-format
 msgid "Purchase Tax %.2f%%"
-msgstr ""
+msgstr "Købsmoms %.2f%%"
 
 #. module: account
 #: view:account.subscription.generate:0
 #: model:ir.actions.act_window,name:account.action_account_subscription_generate
 #: model:ir.ui.menu,name:account.menu_generate_subscription
 msgid "Generate Entries"
-msgstr ""
+msgstr "Dan posteringer"
 
 #. module: account
 #: help:account.vat.declaration,chart_tax_id:0
 msgid "Select Charts of Taxes"
-msgstr ""
+msgstr "Vælg moms oversigter"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -4929,43 +5026,51 @@
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirmed"
-msgstr ""
+msgstr "Bekræftet"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Cancelled Invoice"
-msgstr ""
+msgstr "Annulleret faktura"
 
 #. module: account
 #: view:account.invoice:0
 msgid "My Invoices"
-msgstr ""
+msgstr "Mine fakturaer"
 
 #. module: account
 #: selection:account.bank.statement,state:0
 msgid "New"
-msgstr ""
+msgstr "Ny"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
 msgid "Sale Tax"
-msgstr ""
-
-#. module: account
+msgstr "Salgs moms"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.move:0
+msgid "Cancel Entry"
+msgstr "Fortryd indtastning"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr ""
+msgstr "Refusions momskode"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Invoice "
-msgstr ""
+msgstr "Faktura "
 
 #. module: account
 #: field:account.chart.template,property_account_income:0
 msgid "Income Account on Product Template"
-msgstr ""
+msgstr "Omsætningskonto på vare skabelon"
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -4997,7 +5102,7 @@
 #: view:report.invoice.created:0
 #: field:res.partner,invoice_ids:0
 msgid "Invoices"
-msgstr ""
+msgstr "Fakturaer"
 
 #. module: account
 #: help:account.config.settings,expects_chart_of_accounts:0
@@ -5008,7 +5113,7 @@
 #: model:account.account.type,name:account.conf_account_type_chk
 #: selection:account.bank.accounts.wizard,account_type:0
 msgid "Check"
-msgstr ""
+msgstr "Tjek"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -5048,17 +5153,21 @@
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "or"
-msgstr ""
+msgstr "eller"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Invoiced"
-msgstr ""
+msgstr "Faktureret"
 
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
+<<<<<<< TREE
 msgstr ""
+=======
+msgstr "Bogført under posteringer"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.use.model:0
@@ -5076,7 +5185,7 @@
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr ""
+msgstr "Partnere udlignet i dag"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
@@ -5086,19 +5195,19 @@
 #. module: account
 #: view:account.addtmpl.wizard:0
 msgid "Add"
-msgstr ""
+msgstr "Tilføj"
 
 #. module: account
 #: selection:account.invoice,state:0
 #: report:account.overdue:0
 #: model:mail.message.subtype,name:account.mt_invoice_paid
 msgid "Paid"
-msgstr ""
+msgstr "Betalt"
 
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr ""
+msgstr "Moms linier"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5108,7 +5217,7 @@
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
-msgstr ""
+msgstr "Kladdefakturaer er godkendt. "
 
 #. module: account
 #: help:account.tax,account_collected_id:0
@@ -5121,25 +5230,37 @@
 #: code:addons/account/account.py:890
 #, python-format
 msgid "Opening Period"
-msgstr ""
+msgstr "Åbnings periode"
 
 #. module: account
 #: view:account.move:0
 msgid "Journal Entries to Review"
+<<<<<<< TREE
 msgstr ""
+=======
+msgstr "Posteringer til vurdering"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round Globally"
-msgstr ""
+msgstr "Global afrunding"
 
 #. module: account
 #: view:account.bank.statement:0
 #: view:account.subscription:0
 msgid "Compute"
-msgstr ""
-
-#. module: account
+msgstr "Beregn"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.invoice:0
+msgid "Additional notes..."
+msgstr "Flere noter"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.tax,type_tax_use:0
 msgid "Tax Application"
 msgstr ""
@@ -5160,7 +5281,7 @@
 #: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
-msgstr ""
+msgstr "Aktiv"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5175,33 +5296,39 @@
 #: field:account.analytic.inverted.balance,date2:0
 #: field:account.analytic.journal.report,date2:0
 msgid "End of period"
-msgstr ""
+msgstr "Periode afslutning"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaymentorder0
 msgid "Payment of invoices"
-msgstr ""
+msgstr "Betaling af fakturaer"
 
 #. module: account
 #: sql_constraint:account.invoice:0
 msgid "Invoice Number must be unique per Company!"
-msgstr ""
+msgstr "Fakturanummer skal være unikt pr. firma"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_receivable_graph
 msgid "Balance by Type of Account"
-msgstr ""
+msgstr "Balance pr. konto type"
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_cash_statement.py:301
 #, python-format
 msgid "There is no %s Account on the journal %s."
 msgstr ""
+=======
+#: view:account.fiscalyear.close:0
+msgid "Generate Fiscal Year Opening Entries"
+msgstr "Opret regnskabsår åbningsposteringer"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:res.groups,name:account.group_account_user
 msgid "Accountant"
-msgstr ""
+msgstr "Bogholder"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_treasury_report_all
@@ -5213,17 +5340,17 @@
 #. module: account
 #: model:res.groups,name:account.group_account_manager
 msgid "Financial Manager"
-msgstr ""
+msgstr "Regnskabschef"
 
 #. module: account
 #: field:account.journal,group_invoice_lines:0
 msgid "Group Invoice Lines"
-msgstr ""
+msgstr "Grupper fakturalinier"
 
 #. module: account
 #: view:account.automatic.reconcile:0
 msgid "Close"
-msgstr ""
+msgstr "Luk"
 
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
@@ -5239,9 +5366,17 @@
 #. module: account
 #: model:ir.model,name:account.model_account_vat_declaration
 msgid "Account Vat Declaration"
-msgstr ""
-
-#. module: account
+msgstr "Momsopgørelse for konto"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.bank.statement:0
+msgid "Cancel Statement"
+msgstr "Fortryd kontoudtog"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.config.settings,module_account_accountant:0
 msgid ""
 "If you do not check this box, you will be able to do invoicing & payments, "
@@ -5251,27 +5386,27 @@
 #. module: account
 #: view:account.period:0
 msgid "To Close"
-msgstr ""
+msgstr "Skal lukkes"
 
 #. module: account
 #: field:account.treasury.report,date:0
 msgid "Beginning of Period Date"
-msgstr ""
+msgstr "Dato for periodestart"
 
 #. module: account
 #: model:ir.ui.menu,name:account.account_template_folder
 msgid "Templates"
-msgstr ""
+msgstr "Skabeloner"
 
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr ""
+msgstr "Moms beskrivelse"
 
 #. module: account
 #: field:account.tax,child_ids:0
 msgid "Child Tax Accounts"
-msgstr ""
+msgstr "Under momskonti"
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -5284,7 +5419,7 @@
 #. module: account
 #: report:account.analytic.account.balance:0
 msgid "Analytic Balance -"
-msgstr ""
+msgstr "Analytisk balance -"
 
 #. module: account
 #: report:account.account.balance:0
@@ -5332,19 +5467,19 @@
 #. module: account
 #: field:account.subscription,period_type:0
 msgid "Period Type"
-msgstr ""
+msgstr "Periode type"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.invoice,payment_ids:0
 #: selection:account.vat.declaration,based_on:0
 msgid "Payments"
-msgstr ""
+msgstr "Betalinger"
 
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr ""
+msgstr "Indtastning"
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
@@ -5357,7 +5492,7 @@
 #: model:ir.actions.act_window,name:account.action_payment_term_form
 #: model:ir.ui.menu,name:account.menu_action_payment_term_form
 msgid "Payment Terms"
-msgstr ""
+msgstr "Betalingsbetingelser"
 
 #. module: account
 #: help:account.chart.template,complete_tax_set:0
@@ -5372,7 +5507,7 @@
 #: field:account.financial.report,children_ids:0
 #: model:ir.model,name:account.model_account_financial_report
 msgid "Account Report"
-msgstr ""
+msgstr "Konto rapport"
 
 #. module: account
 #: field:account.entries.report,year:0
@@ -5385,7 +5520,7 @@
 #: view:report.account_type.sales:0
 #: field:report.account_type.sales,name:0
 msgid "Year"
-msgstr ""
+msgstr "År"
 
 #. module: account
 #: help:account.invoice,sent:0
@@ -5409,43 +5544,43 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Pro Forma Invoice "
-msgstr ""
+msgstr "Proforma faktura "
 
 #. module: account
 #: selection:account.subscription,period_type:0
 msgid "month"
-msgstr ""
+msgstr "måned"
 
 #. module: account
 #: view:account.move.line:0
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr ""
+msgstr "Afstemning af næste partner"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
 #: field:account.move.line,tax_code_id:0
 msgid "Tax Account"
-msgstr ""
+msgstr "Moms konto"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
 #: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
-msgstr ""
+msgstr "Balance"
 
 #. module: account
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:188
 #, python-format
 msgid "Profit & Loss (Income account)"
-msgstr ""
+msgstr "Tab & Vind (Indtægstkonto)"
 
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date in Period"
-msgstr ""
+msgstr "Tjek dato i perioden"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
@@ -5462,7 +5597,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "This Period"
-msgstr ""
+msgstr "Denne periode"
 
 #. module: account
 #: view:account.tax.template:0
@@ -5491,7 +5626,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_automatic_reconcile
 msgid "Automatic Reconcile"
-msgstr ""
+msgstr "Automatisk udligning"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -5526,7 +5661,7 @@
 #: model:process.transition,name:account.process_transition_suppliervalidentries0
 #: model:process.transition,name:account.process_transition_validentries0
 msgid "Validation"
-msgstr ""
+msgstr "Validering"
 
 #. module: account
 #: help:account.bank.statement,message_summary:0
@@ -5556,7 +5691,7 @@
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr ""
+msgstr "Tillad annullering af indtastninger"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -5580,12 +5715,12 @@
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
 msgid "Progress"
-msgstr ""
+msgstr "Fremdrift"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,bank_accounts_id:0
 msgid "Cash and Banks"
-msgstr ""
+msgstr "Kasse og banker"
 
 #. module: account
 #: model:ir.model,name:account.model_account_installer
@@ -5595,7 +5730,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Recompute taxes and total"
-msgstr ""
+msgstr "Genberegn moms og totaler"
 
 #. module: account
 #: code:addons/account/account.py:1116
@@ -5606,12 +5741,12 @@
 #. module: account
 #: field:account.tax.template,include_base_amount:0
 msgid "Include in Base Amount"
-msgstr ""
+msgstr "Inkludér i basisbeløb"
 
 #. module: account
 #: field:account.invoice,supplier_invoice_number:0
 msgid "Supplier Invoice Number"
-msgstr ""
+msgstr "Leverandør fakturanummer"
 
 #. module: account
 #: help:account.payment.term.line,days:0
@@ -5623,7 +5758,7 @@
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Amount Computation"
-msgstr ""
+msgstr "Beløbs beregning"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1105
@@ -5649,7 +5784,7 @@
 #: field:account.analytic.inverted.balance,date1:0
 #: field:account.analytic.journal.report,date1:0
 msgid "Start of period"
-msgstr ""
+msgstr "Periode start"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_asset_view1
@@ -5672,7 +5807,7 @@
 #: selection:account.period,state:0
 #: selection:report.invoice.created,state:0
 msgid "Open"
-msgstr ""
+msgstr "Åbn"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5697,14 +5832,14 @@
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Tax Codes"
-msgstr ""
+msgstr "Moms koder"
 
 #. module: account
 #: selection:account.invoice,type:0
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Kunde kreditnota"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -5717,17 +5852,17 @@
 #. module: account
 #: model:ir.model,name:account.model_report_invoice_created
 msgid "Report of Invoices Created within Last 15 days"
-msgstr ""
+msgstr "Rapport over fakturaer dannet indenfor seneste 15 dage"
 
 #. module: account
 #: field:account.fiscalyear,end_journal_period_id:0
 msgid "End of Year Entries Journal"
-msgstr ""
+msgstr "Årsafslutnings journal"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund "
-msgstr ""
+msgstr "Kladde kreditnota "
 
 #. module: account
 #: view:cash.box.in:0
@@ -5738,7 +5873,7 @@
 #: view:account.payment.term.line:0
 #: field:account.payment.term.line,value_amount:0
 msgid "Amount To Pay"
-msgstr ""
+msgstr "Beløb til betaling"
 
 #. module: account
 #: help:account.partner.reconcile.process,to_reconcile:0
@@ -5756,7 +5891,7 @@
 #. module: account
 #: field:account.entries.report,quantity:0
 msgid "Products Quantity"
-msgstr ""
+msgstr "Vare antal"
 
 #. module: account
 #: view:account.entries.report:0
@@ -5765,14 +5900,14 @@
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr ""
+msgstr "Ikke bogført"
 
 #. module: account
 #: view:account.change.currency:0
 #: model:ir.actions.act_window,name:account.action_account_change_currency
 #: model:ir.model,name:account.model_account_change_currency
 msgid "Change Currency"
-msgstr ""
+msgstr "Skift valuta"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingentries0
@@ -5783,7 +5918,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Payment Date"
-msgstr ""
+msgstr "Betalingsdato"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5814,7 +5949,7 @@
 #. module: account
 #: selection:res.company,tax_calculation_rounding_method:0
 msgid "Round per Line"
-msgstr ""
+msgstr "Afrunding pr. linie"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5839,7 +5974,7 @@
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Normal Text"
-msgstr ""
+msgstr "Normal tekst"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentreconcile0
@@ -5875,14 +6010,14 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Refund"
-msgstr ""
+msgstr "Kladde kreditnota"
 
 #. module: account
 #: view:account.analytic.chart:0
 #: view:account.chart:0
 #: view:account.tax.chart:0
 msgid "Open Charts"
-msgstr ""
+msgstr "Åbn oversigter"
 
 #. module: account
 #: field:account.central.journal,amount_currency:0
@@ -5892,7 +6027,7 @@
 #: field:account.print.journal,amount_currency:0
 #: field:account.report.general.ledger,amount_currency:0
 msgid "With Currency"
-msgstr ""
+msgstr "Med valuta"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5902,12 +6037,12 @@
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Automatic formatting"
-msgstr ""
+msgstr "Automatisk formattering"
 
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconcile With Write-Off"
-msgstr ""
+msgstr "Udlign med afskrivninger"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -5929,7 +6064,7 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_automatic_reconcile
 msgid "Account Automatic Reconcile"
-msgstr ""
+msgstr "Automatisk udligning af konto"
 
 #. module: account
 #: view:account.move:0
@@ -5941,22 +6076,22 @@
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Opening Entries"
-msgstr ""
+msgstr "Dan åbningsposteringer"
 
 #. module: account
 #: help:account.tax,type:0
 msgid "The computation method for the tax amount."
-msgstr ""
+msgstr "Beregningsmetode for denne momskode."
 
 #. module: account
 #: view:account.payment.term.line:0
 msgid "Due Date Computation"
-msgstr ""
+msgstr "Forfaldsdato beregning"
 
 #. module: account
 #: field:report.invoice.created,create_date:0
 msgid "Create Date"
-msgstr ""
+msgstr "Opret dato"
 
 #. module: account
 #: view:account.analytic.journal:0
@@ -5964,12 +6099,12 @@
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_form
 #: model:ir.ui.menu,name:account.account_def_analytic_journal
 msgid "Analytic Journals"
-msgstr ""
+msgstr "Analytiske journaler"
 
 #. module: account
 #: field:account.account,child_id:0
 msgid "Child Accounts"
-msgstr ""
+msgstr "Under-konti"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1117
@@ -5982,17 +6117,17 @@
 #: code:addons/account/account_move_line.py:879
 #, python-format
 msgid "Write-Off"
-msgstr ""
+msgstr "Afskrivning"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "entries"
-msgstr ""
+msgstr "poster"
 
 #. module: account
 #: field:res.partner,debit:0
 msgid "Total Payable"
-msgstr ""
+msgstr "Total skyldig"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_income
@@ -6017,7 +6152,7 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "March"
-msgstr ""
+msgstr "Marts"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -6040,7 +6175,7 @@
 #: code:addons/account/report/account_partner_ledger.py:276
 #, python-format
 msgid "Receivable and Payable Accounts"
-msgstr ""
+msgstr "Debitor og kreditor konti"
 
 #. module: account
 #: field:account.fiscal.position.account.template,position_id:0
@@ -6050,7 +6185,7 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "Select Company"
-msgstr ""
+msgstr "Vælg firma"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_state_open
@@ -6061,13 +6196,13 @@
 #. module: account
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Max Qty:"
-msgstr ""
+msgstr "Max antal"
 
 #. module: account
 #: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_refund
 msgid "Refund Invoice"
-msgstr ""
+msgstr "Kreditnota"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_entries_report_all
@@ -6090,7 +6225,7 @@
 #: field:report.account.sales,period_id:0
 #: field:report.account_type.sales,period_id:0
 msgid "Force Period"
-msgstr ""
+msgstr "Gennemtving periode"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_form
@@ -6138,7 +6273,7 @@
 #: field:accounting.report,filter:0
 #: field:accounting.report,filter_cmp:0
 msgid "Filter by"
-msgstr ""
+msgstr "filtrer efter"
 
 #. module: account
 #: code:addons/account/account.py:2334
@@ -6159,13 +6294,13 @@
 #. module: account
 #: field:account.journal,loss_account_id:0
 msgid "Loss Account"
-msgstr ""
+msgstr "Tabs konto"
 
 #. module: account
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr ""
+msgstr "Faktura moms konto"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_general_journal
@@ -6186,7 +6321,7 @@
 #. module: account
 #: field:account.payment.term.line,days:0
 msgid "Number of Days"
-msgstr ""
+msgstr "Antal dage"
 
 #. module: account
 #: code:addons/account/account.py:1357
@@ -6199,7 +6334,7 @@
 #. module: account
 #: view:account.financial.report:0
 msgid "Report"
-msgstr ""
+msgstr "Rapport"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
@@ -6215,14 +6350,14 @@
 #: report:account.analytic.account.cost_ledger:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Printing date"
-msgstr ""
+msgstr "Udskrivningsdato"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 #: selection:account.tax,type:0
 #: selection:account.tax.template,type:0
 msgid "None"
-msgstr ""
+msgstr "Ingen"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
@@ -6238,7 +6373,7 @@
 #. module: account
 #: field:account.journal.period,name:0
 msgid "Journal-Period Name"
-msgstr ""
+msgstr "Journal periode navn"
 
 #. module: account
 #: field:account.invoice.tax,factor_base:0
@@ -6248,12 +6383,12 @@
 #. module: account
 #: help:account.journal,company_id:0
 msgid "Company related to this journal"
-msgstr ""
+msgstr "Firma knyttet til denne konto"
 
 #. module: account
 #: help:account.config.settings,group_multi_currency:0
 msgid "Allows you multi currency environment"
-msgstr ""
+msgstr "Tillader multi-valuta"
 
 #. module: account
 #: view:account.subscription:0
@@ -6287,18 +6422,18 @@
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Entry"
-msgstr ""
+msgstr "Analytisk postering"
 
 #. module: account
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr ""
+msgstr "Forfalden betalings besked"
 
 #. module: account
 #: field:account.entries.report,date_created:0
 msgid "Date Created"
-msgstr ""
+msgstr "Dato oprettet"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_line_extended_form
@@ -6316,7 +6451,7 @@
 #: view:account.chart.template:0
 #: field:account.chart.template,account_root_id:0
 msgid "Root Account"
-msgstr ""
+msgstr "Oprindelses konto"
 
 #. module: account
 #: field:res.partner,last_reconciliation_date:0
@@ -6332,7 +6467,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_model_form
 msgid "Models"
-msgstr ""
+msgstr "Modeller"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1124
@@ -6345,7 +6480,7 @@
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr ""
+msgstr "Kunde moms"
 
 #. module: account
 #: help:account.model,name:0
@@ -6355,12 +6490,12 @@
 #. module: account
 #: field:wizard.multi.charts.accounts,sale_tax_rate:0
 msgid "Sales Tax(%)"
-msgstr ""
+msgstr "Salgsmoms"
 
 #. module: account
 #: view:account.tax.code:0
 msgid "Reporting Configuration"
-msgstr ""
+msgstr "Rapporterings opsætning"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_invoice_tree4
@@ -6380,13 +6515,13 @@
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr ""
+msgstr "Moms type"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_template_form
 msgid "Account Templates"
-msgstr ""
+msgstr "Konto skabeloner"
 
 #. module: account
 #: help:account.config.settings,complete_tax_set:0
@@ -6401,17 +6536,17 @@
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr ""
+msgstr "Moms kontoudtog"
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
 msgid "Companies"
-msgstr ""
+msgstr "Firmaer"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Open and Paid Invoices"
-msgstr ""
+msgstr "Åbne og betalte fakturaer"
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
@@ -6421,12 +6556,12 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "Bank & Cash"
-msgstr ""
+msgstr "Bank og kasse"
 
 #. module: account
 #: help:account.fiscalyear.close.state,fy_id:0
 msgid "Select a fiscal year to close"
-msgstr ""
+msgstr "Vælg regnskabsår at lukke"
 
 #. module: account
 #: help:account.chart.template,tax_template_ids:0
@@ -6447,12 +6582,12 @@
 #: field:account.chart,fiscalyear:0
 #: view:account.fiscalyear:0
 msgid "Fiscal year"
-msgstr ""
+msgstr "Regnskabsår"
 
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Partial Reconcile Entries"
-msgstr ""
+msgstr "Delvist udlignede poster"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6491,7 +6626,7 @@
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Cancel"
-msgstr ""
+msgstr "Annullér"
 
 #. module: account
 #: selection:account.account,type:0
@@ -6499,7 +6634,7 @@
 #: model:account.account.type,name:account.data_account_type_receivable
 #: selection:account.entries.report,type:0
 msgid "Receivable"
-msgstr ""
+msgstr "Kreditor"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -6515,12 +6650,12 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Other Info"
-msgstr ""
+msgstr "Anden info"
 
 #. module: account
 #: field:account.journal,default_credit_account_id:0
 msgid "Default Credit Account"
-msgstr ""
+msgstr "Standard krediterings konto"
 
 #. module: account
 #: help:account.analytic.line,currency_id:0
@@ -6531,7 +6666,7 @@
 #: code:addons/account/installer.py:69
 #, python-format
 msgid "Custom"
-msgstr ""
+msgstr "Tilpasset"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -6547,12 +6682,12 @@
 #: model:account.account.type,name:account.account_type_cash_equity
 #: model:account.account.type,name:account.conf_account_type_equity
 msgid "Equity"
-msgstr ""
+msgstr "Egenkapital"
 
 #. module: account
 #: field:account.journal,internal_account_id:0
 msgid "Internal Transfers Account"
-msgstr ""
+msgstr "Konto for interne flytninger"
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:32
@@ -6563,12 +6698,12 @@
 #. module: account
 #: selection:account.tax,type:0
 msgid "Percentage"
-msgstr ""
+msgstr "Procent"
 
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
 msgid "Round globally"
-msgstr ""
+msgstr "Afrund globalt"
 
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
@@ -6587,20 +6722,28 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:account.invoice:0
+msgid "force period"
+msgstr "Gennemtving periode"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:project.account.analytic.line:0
 msgid "View Account Analytic Lines"
-msgstr ""
+msgstr "Vis kontoens analytiske poster"
 
 #. module: account
 #: field:account.invoice,internal_number:0
 #: field:report.invoice.created,number:0
 msgid "Invoice Number"
-msgstr ""
+msgstr "Fakturanummer"
 
 #. module: account
 #: field:account.bank.statement,difference:0
 msgid "Difference"
-msgstr ""
+msgstr "Forskel"
 
 #. module: account
 #: help:account.tax,include_base_amount:0
@@ -6612,7 +6755,7 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr ""
+msgstr "Udligning: Gå til næste partner"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
@@ -6642,6 +6785,8 @@
 "There is no opening/closing period defined, please create one to set the "
 "initial balance."
 msgstr ""
+"Der er ikke defineret nogen åbnings-/lukningsperiode, opret en for at få en "
+"åbningsbalance."
 
 #. module: account
 #: help:account.tax.template,sequence:0
@@ -6666,25 +6811,25 @@
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "User Error!"
-msgstr ""
+msgstr "Brugerfejl !"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
 msgid "Discard"
-msgstr ""
+msgstr "Kasser"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: view:account.journal:0
 msgid "Liquidity"
-msgstr ""
+msgstr "Likviditet"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr ""
+msgstr "Analytisk journalposteringer"
 
 #. module: account
 #: field:account.config.settings,has_default_company:0
@@ -6702,7 +6847,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
 msgid "Bank and Cash"
-msgstr ""
+msgstr "Bank og kasse"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_analytic_entries_report
@@ -6716,12 +6861,12 @@
 #. module: account
 #: sql_constraint:account.journal:0
 msgid "The name of the journal must be unique per company !"
-msgstr ""
+msgstr "Journalens navn skal være unik pr. firma !"
 
 #. module: account
 #: field:account.account.template,nocreate:0
 msgid "Optional create"
-msgstr ""
+msgstr "Optionel oprettelse"
 
 #. module: account
 #: code:addons/account/account.py:686
@@ -6739,12 +6884,12 @@
 #: selection:report.invoice.created,type:0
 #, python-format
 msgid "Supplier Refund"
-msgstr ""
+msgstr "Leverandør kreditnota"
 
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
-msgstr ""
+msgstr "Indtastningslinier"
 
 #. module: account
 #: field:account.move.line,centralisation:0
@@ -6772,7 +6917,7 @@
 #: view:account.tax.code.template:0
 #: view:analytic.entries.report:0
 msgid "Group By..."
-msgstr ""
+msgstr "Sorter efter"
 
 #. module: account
 #: code:addons/account/account.py:1024
@@ -6781,13 +6926,15 @@
 "There is no period defined for this date: %s.\n"
 "Please create one."
 msgstr ""
+"Der er ikke oprettet nogen periode for denne dato: %s.\n"
+"Venligst opret én."
 
 #. module: account
 #: field:account.analytic.line,product_uom_id:0
 #: field:account.invoice.line,uos_id:0
 #: field:account.move.line,product_uom_id:0
 msgid "Unit of Measure"
-msgstr ""
+msgstr "Enhed"
 
 #. module: account
 #: help:account.journal,group_invoice_lines:0
@@ -6816,12 +6963,12 @@
 #: model:ir.model,name:account.model_account_analytic_journal
 #: model:ir.ui.menu,name:account.account_analytic_journal_print
 msgid "Analytic Journal"
-msgstr ""
+msgstr "Analytisk journal"
 
 #. module: account
 #: view:account.entries.report:0
 msgid "Reconciled"
-msgstr ""
+msgstr "Udlignet/afstemt"
 
 #. module: account
 #: constraint:account.payment.term.line:0
@@ -6834,27 +6981,27 @@
 #: report:account.invoice:0
 #: field:account.invoice.tax,base:0
 msgid "Base"
-msgstr ""
+msgstr "Basis"
 
 #. module: account
 #: field:account.model,name:0
 msgid "Model Name"
-msgstr ""
+msgstr "Modelnavn"
 
 #. module: account
 #: field:account.chart.template,property_account_expense_categ:0
 msgid "Expense Category Account"
-msgstr ""
+msgstr "Omkostningskonto"
 
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "Tax Name must be unique per company!"
-msgstr ""
+msgstr "Moms navn skal være unikt pr. firma !"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Cash Transactions"
-msgstr ""
+msgstr "Kasse-bevægelser"
 
 #. module: account
 #: view:account.unreconcile:0
@@ -6871,24 +7018,24 @@
 #: field:account.fiscal.position,note:0
 #: field:account.fiscal.position.template,note:0
 msgid "Notes"
-msgstr ""
+msgstr "Noter"
 
 #. module: account
 #: model:ir.model,name:account.model_analytic_entries_report
 msgid "Analytic Entries Statistics"
-msgstr ""
+msgstr "Statistik over analytiske posteringer"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:142
 #: code:addons/account/account_move_line.py:955
 #, python-format
 msgid "Entries: "
-msgstr ""
+msgstr "Posteringer "
 
 #. module: account
 #: help:res.partner.bank,currency_id:0
 msgid "Currency of the related account journal."
-msgstr ""
+msgstr "Valuta på den relaterede kontojournal."
 
 #. module: account
 #: constraint:account.move.line:0
@@ -6907,27 +7054,27 @@
 #: code:addons/account/account.py:190
 #, python-format
 msgid "Balance Sheet (Asset account)"
-msgstr ""
+msgstr "Balance (aktiver)"
 
 #. module: account
 #: model:process.node,note:account.process_node_draftstatement0
 msgid "State is draft"
-msgstr ""
+msgstr "I \"kladde\" status"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Total debit"
-msgstr ""
+msgstr "Total debit"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr ""
+msgstr "Ingen partner posteringer at udligne"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Fax :"
-msgstr ""
+msgstr "Fax :"
 
 #. module: account
 #: help:res.partner,property_account_receivable:0
@@ -6950,7 +7097,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "Journal Entries with period in current period"
-msgstr ""
+msgstr "Posteringer med dato i indeværende periode"
 
 #. module: account
 #: help:account.journal,update_posted:0
@@ -6962,42 +7109,50 @@
 #. module: account
 #: view:account.fiscalyear.close:0
 msgid "Create"
-msgstr ""
+msgstr "Opret"
 
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
 msgid "Create entry"
-msgstr ""
-
-#. module: account
+msgstr "Indtast"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.open.closed.fiscalyear:0
+msgid "Cancel Fiscal Year Closing Entries"
+msgstr "Fortryd regnskabsår afslutningsposteringer"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:189
 #, python-format
 msgid "Profit & Loss (Expense account)"
-msgstr ""
+msgstr "Tab & Vind (udgiftskonto)"
 
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Total Transactions"
-msgstr ""
+msgstr "Totale posteringer"
 
 #. module: account
 #: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
-msgstr ""
+msgstr "Du kan ikke fjerne en konto der indeholder posteringer"
 
 #. module: account
 #: code:addons/account/account.py:1024
 #: code:addons/account/account_move_line.py:1105
 #, python-format
 msgid "Error !"
-msgstr ""
+msgstr "Fejl!"
 
 #. module: account
 #: field:account.financial.report,style_overwrite:0
 msgid "Financial Report Style"
-msgstr ""
+msgstr "Finans rapport opsætning"
 
 #. module: account
 #: selection:account.financial.report,sign:0
@@ -7009,33 +7164,33 @@
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 #: model:ir.ui.menu,name:account.menu_account_vat_declaration
 msgid "Taxes Report"
-msgstr ""
+msgstr "Moms rapport"
 
 #. module: account
 #: selection:account.journal.period,state:0
 msgid "Printed"
-msgstr ""
+msgstr "Udskrevet"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Project line"
-msgstr ""
+msgstr "Projektlinie"
 
 #. module: account
 #: field:account.invoice.tax,manual:0
 msgid "Manual"
-msgstr ""
+msgstr "Manuel"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: create refund and reconcile"
-msgstr ""
+msgstr "Annulér: opret kreditnota og udlign"
 
 #. module: account
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "You must set a start date."
-msgstr ""
+msgstr "Du skal angive en startdato"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7051,7 +7206,7 @@
 #: view:account.move:0
 #: field:account.move,to_check:0
 msgid "To Review"
-msgstr ""
+msgstr "Til gennemgang"
 
 #. module: account
 #: help:account.partner.ledger,initial_balance:0
@@ -7069,18 +7224,18 @@
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Journal Entries"
-msgstr ""
+msgstr "Posteringer"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:147
 #, python-format
 msgid "No period found on the invoice."
-msgstr ""
+msgstr "Ingen periode angivet på fakturaen"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
 msgid "Display Ledger Report with One partner per page"
-msgstr ""
+msgstr "Vis finansrapport med én partner pr. side"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -7115,17 +7270,17 @@
 #: code:addons/account/report/common_report_header.py:67
 #, python-format
 msgid "All Entries"
-msgstr ""
+msgstr "Alle indtastninger"
 
 #. module: account
 #: constraint:account.move.reconcile:0
 msgid "You can only reconcile journal items with the same partner."
-msgstr ""
+msgstr "Du kan kun afstemme posteringer fra den samme partner."
 
 #. module: account
 #: view:account.journal.select:0
 msgid "Journal Select"
-msgstr ""
+msgstr "Journal udvælgelse"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7133,12 +7288,12 @@
 #: code:addons/account/account.py:434
 #, python-format
 msgid "Opening Balance"
-msgstr ""
+msgstr "Åbningsbalance"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_reconcile
 msgid "Account Reconciliation"
-msgstr ""
+msgstr "Kontoafstemning"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
@@ -7153,12 +7308,12 @@
 #: model:ir.actions.report.xml,name:account.account_general_ledger_landscape
 #: model:ir.ui.menu,name:account.menu_general_ledger
 msgid "General Ledger"
-msgstr ""
+msgstr "Finans"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_paymentorderbank0
 msgid "The payment order is sent to the bank."
-msgstr ""
+msgstr "Betalingsordre sendt til banken."
 
 #. module: account
 #: help:account.move,to_check:0
@@ -7171,7 +7326,7 @@
 #: field:account.chart.template,complete_tax_set:0
 #: field:wizard.multi.charts.accounts,complete_tax_set:0
 msgid "Complete Set of Taxes"
-msgstr ""
+msgstr "Komplet sæt momskoder"
 
 #. module: account
 #: code:addons/account/wizard/account_validate_account_move.py:61
@@ -7183,12 +7338,12 @@
 #. module: account
 #: view:account.chart.template:0
 msgid "Properties"
-msgstr ""
+msgstr "Egenskaber"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_chart
 msgid "Account tax chart"
-msgstr ""
+msgstr "Konto momsoversigt"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -7200,7 +7355,7 @@
 #: report:account.journal.period.print.sale.purchase:0
 #: report:account.partner.balance:0
 msgid "Total:"
-msgstr ""
+msgstr "Total:"
 
 #. module: account
 #: constraint:account.journal:0
@@ -7226,7 +7381,7 @@
 #. module: account
 #: field:account.invoice,paypal_url:0
 msgid "Paypal Url"
-msgstr ""
+msgstr "Paypal Url"
 
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
@@ -7242,7 +7397,7 @@
 #: field:account.tax.code,child_ids:0
 #: field:account.tax.code.template,child_ids:0
 msgid "Child Codes"
-msgstr ""
+msgstr "Under-koder"
 
 #. module: account
 #: constraint:account.fiscalyear:0
@@ -7254,9 +7409,17 @@
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Sales"
-msgstr ""
-
-#. module: account
+msgstr "Moms anvendt i salg"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.period:0
+msgid "Re-Open Period"
+msgstr "Gen-åben periode"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree1
 msgid "Customer Invoices"
@@ -7265,12 +7428,12 @@
 #. module: account
 #: view:account.tax:0
 msgid "Misc"
-msgstr ""
+msgstr "Diverse"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Sales"
-msgstr ""
+msgstr "Salg"
 
 #. module: account
 #: selection:account.invoice.report,state:0
@@ -7278,7 +7441,7 @@
 #: selection:account.subscription,state:0
 #: selection:report.invoice.created,state:0
 msgid "Done"
-msgstr ""
+msgstr "Udført"
 
 #. module: account
 #: code:addons/account/account.py:1319
@@ -7292,7 +7455,7 @@
 #. module: account
 #: model:process.transition,note:account.process_transition_invoicemanually0
 msgid "A statement with manual entries becomes a draft statement."
-msgstr ""
+msgstr "Et udtog med manuelle posteringer bliver et kladde-udtog"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -7310,12 +7473,24 @@
 #: field:account.invoice.line,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr ""
+msgstr "Kilde dokument"
 
 #. module: account
+<<<<<<< TREE
 #: help:account.config.settings,company_footer:0
 msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
+=======
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Internal notes..."
+msgstr "Interne noter..."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: constraint:account.account:0
@@ -7333,12 +7508,12 @@
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account Currency"
-msgstr ""
+msgstr "Konto valuta"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Taxes:"
-msgstr ""
+msgstr "Moms"
 
 #. module: account
 #: code:addons/account/account_invoice.py:458
@@ -7356,29 +7531,29 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_report_tree_hierarchy
 msgid "Financial Reports Hierarchy"
-msgstr ""
+msgstr "Hierarki af finansrapporter"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_invoice_partner_relation
 msgid "Monthly Turnover"
-msgstr ""
+msgstr "Omsætning pr.  måned"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Analytic Lines"
-msgstr ""
+msgstr "Analytiske linier"
 
 #. module: account
 #: field:account.analytic.journal,line_ids:0
 #: field:account.tax.code,line_ids:0
 msgid "Lines"
-msgstr ""
+msgstr "Linier"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Account Tax Template"
-msgstr ""
+msgstr "Konto momsskabelon"
 
 #. module: account
 #: view:account.journal.select:0
@@ -7393,22 +7568,22 @@
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr ""
+msgstr "Udgiftsrapport over åbningsposteringer"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Customer Reference"
-msgstr ""
+msgstr "Kunde Reference"
 
 #. module: account
 #: field:account.account.template,parent_id:0
 msgid "Parent Account Template"
-msgstr ""
+msgstr "Hoved kontoskabelon"
 
 #. module: account
 #: report:account.invoice:0
 msgid "Price"
-msgstr ""
+msgstr "Pris"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7422,7 +7597,7 @@
 #: field:account.move.line,statement_id:0
 #: model:process.process,name:account.process_process_statementprocess0
 msgid "Statement"
-msgstr ""
+msgstr "Kontoudtog"
 
 #. module: account
 #: help:account.journal,default_debit_account_id:0
@@ -7432,7 +7607,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr ""
+msgstr "Bogførte posteringer"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
@@ -7450,42 +7625,42 @@
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by year of Invoice Date"
-msgstr ""
+msgstr "Sorter efter år ud fra fakturadato"
 
 #. module: account
 #: field:account.config.settings,purchase_tax_rate:0
 msgid "Purchase tax (%)"
-msgstr ""
+msgstr "Indkøbs moms (%)"
 
 #. module: account
 #: help:res.partner,credit:0
 msgid "Total amount this customer owes you."
-msgstr ""
+msgstr "Totalbeløb denne kunde skylder dig."
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr ""
+msgstr "Posteringer i ubalance"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_account_charts_modules
 msgid "Chart Templates"
-msgstr ""
+msgstr "Oversigts skabeloner"
 
 #. module: account
 #: field:account.journal.period,icon:0
 msgid "Icon"
-msgstr ""
+msgstr "Ikon"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr ""
+msgstr "Basis momskode"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -7503,27 +7678,27 @@
 #. module: account
 #: model:ir.model,name:account.model_account_bank_statement_line
 msgid "Bank Statement Line"
-msgstr ""
+msgstr "Bank kontoudtogslinie"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax:0
 msgid "Default Purchase Tax"
-msgstr ""
+msgstr "Standard indkøbsmoms"
 
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
 msgid "Opening Entries Income Account"
-msgstr ""
+msgstr "Omsætningskonto for åbningsposteringer"
 
 #. module: account
 #: field:account.config.settings,group_proforma_invoices:0
 msgid "Allow pro-forma invoices"
-msgstr ""
+msgstr "Tillad proforma fakturaer"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Confirm"
-msgstr ""
+msgstr "Bekræft"
 
 #. module: account
 #: help:account.tax,domain:0
@@ -7537,17 +7712,17 @@
 #: field:account.invoice,reference:0
 #: field:account.invoice.line,invoice_id:0
 msgid "Invoice Reference"
-msgstr ""
+msgstr "Faktura reference"
 
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
-msgstr ""
+msgstr "Navn på nye indtastninger"
 
 #. module: account
 #: view:account.use.model:0
 msgid "Create Entries"
-msgstr ""
+msgstr "Opret indtastninger"
 
 #. module: account
 #: model:ir.model,name:account.model_cash_box_out
@@ -7557,12 +7732,12 @@
 #. module: account
 #: help:account.config.settings,currency_id:0
 msgid "Main currency of the company."
-msgstr ""
+msgstr "Hovedvaluta for firmaet"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reports
 msgid "Reporting"
-msgstr ""
+msgstr "Rapportering"
 
 #. module: account
 #. openerp-web
@@ -7570,29 +7745,29 @@
 #: code:addons/account/static/src/js/account_move_reconciliation.js:90
 #, python-format
 msgid "Warning"
-msgstr ""
+msgstr "Advarsel!"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_analytic_open
 msgid "Contracts/Analytic Accounts"
-msgstr ""
+msgstr "Kontrakter/analytiske konti"
 
 #. module: account
 #: view:account.journal:0
 #: field:res.partner.bank,journal_id:0
 msgid "Account Journal"
-msgstr ""
+msgstr "Konto journal"
 
 #. module: account
 #: field:account.config.settings,tax_calculation_rounding_method:0
 msgid "Tax calculation rounding method"
-msgstr ""
+msgstr "Momsafrundings-metode"
 
 #. module: account
 #: model:process.node,name:account.process_node_paidinvoice0
 #: model:process.node,name:account.process_node_supplierpaidinvoice0
 msgid "Paid invoice"
-msgstr ""
+msgstr "Betalt faktura"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -7615,7 +7790,7 @@
 #. module: account
 #: field:account.move.line.reconcile.writeoff,comment:0
 msgid "Comment"
-msgstr ""
+msgstr "Kommentar"
 
 #. module: account
 #: field:account.tax,domain:0
@@ -7641,7 +7816,7 @@
 #: field:account.invoice.tax,invoice_id:0
 #: model:ir.model,name:account.model_account_invoice_line
 msgid "Invoice Line"
-msgstr ""
+msgstr "Faktura linie"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -7677,7 +7852,7 @@
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
 msgid "Root/View"
-msgstr ""
+msgstr "Basis/oversigt"
 
 #. module: account
 #: code:addons/account/account.py:3206
@@ -7689,30 +7864,30 @@
 #: report:account.invoice:0
 #: view:account.invoice:0
 msgid "PRO-FORMA"
-msgstr ""
+msgstr "PRO-FORMA"
 
 #. module: account
 #: selection:account.entries.report,move_line_state:0
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr ""
+msgstr "Ikke i balance"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 msgid "Normal"
-msgstr ""
+msgstr "Normal"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_email_templates
 #: model:ir.ui.menu,name:account.menu_email_templates
 msgid "Email Templates"
-msgstr ""
+msgstr "Email Templates"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Optional Information"
-msgstr ""
+msgstr "Valgfri information"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -7727,7 +7902,7 @@
 #. module: account
 #: selection:account.account,currency_mode:0
 msgid "At Date"
-msgstr ""
+msgstr "På dato"
 
 #. module: account
 #: help:account.move.line,date_maturity:0
@@ -7739,23 +7914,23 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_multi_currency
 msgid "Multi-Currencies"
-msgstr ""
+msgstr "Multi-valuta"
 
 #. module: account
 #: field:account.model.line,date_maturity:0
 msgid "Maturity Date"
-msgstr ""
+msgstr "Modenheds dato"
 
 #. module: account
 #: code:addons/account/account.py:3193
 #, python-format
 msgid "Sales Journal"
-msgstr ""
+msgstr "Salgs journal"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
 msgid "Invoice Tax"
-msgstr ""
+msgstr "Faktura moms"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1185
@@ -7767,7 +7942,7 @@
 #: view:account.financial.report:0
 #: model:ir.ui.menu,name:account.menu_account_report_tree_hierarchy
 msgid "Account Reports Hierarchy"
-msgstr ""
+msgstr "Konto rapport hierarki"
 
 #. module: account
 #: help:account.account.template,chart_template_id:0
@@ -7782,7 +7957,7 @@
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr ""
+msgstr "Ikke-bogførte posteringer"
 
 #. module: account
 #: help:account.invoice.refund,date:0
@@ -7794,7 +7969,7 @@
 #. module: account
 #: view:product.template:0
 msgid "Sales Properties"
-msgstr ""
+msgstr "Salgs egenskaber"
 
 #. module: account
 #: code:addons/account/account.py:3541
@@ -7807,36 +7982,36 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
 msgid "Manual Reconciliation"
-msgstr ""
+msgstr "Manuel afstemning/udligning"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Total amount due:"
-msgstr ""
+msgstr "Totalf forfaldende beløb:"
 
 #. module: account
 #: field:account.analytic.chart,to_date:0
 #: field:project.account.analytic.line,to_date:0
 msgid "To"
-msgstr ""
+msgstr "Til"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
 #: code:addons/account/account.py:1541
 #, python-format
 msgid "Currency Adjustment"
-msgstr ""
+msgstr "Vauta justering"
 
 #. module: account
 #: field:account.fiscalyear.close,fy_id:0
 msgid "Fiscal Year to close"
-msgstr ""
+msgstr "Finansår til afslutning"
 
 #. module: account
 #: view:account.invoice.cancel:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_cancel
 msgid "Cancel Selected Invoices"
-msgstr ""
+msgstr "Fortryd valgte fakturaer"
 
 #. module: account
 #: help:account.account.type,report_type:0
@@ -7851,7 +8026,7 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "May"
-msgstr ""
+msgstr "Maj"
 
 #. module: account
 #: code:addons/account/account_invoice.py:820
@@ -7862,7 +8037,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
-msgstr ""
+msgstr "Skabeloner for kontooversigter"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -7874,12 +8049,12 @@
 #. module: account
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount in Currency"
-msgstr ""
+msgstr "Tilbageværende valutabeløb"
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
 msgid "Credit note sequence"
-msgstr ""
+msgstr "Kreditnota bilagsrækkefølge"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move
@@ -7888,7 +8063,7 @@
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr ""
+msgstr "Efterposteringer"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -7898,12 +8073,12 @@
 #: code:addons/account/account_invoice.py:388
 #, python-format
 msgid "Customer"
-msgstr ""
+msgstr "Kunde"
 
 #. module: account
 #: field:account.financial.report,name:0
 msgid "Report Name"
-msgstr ""
+msgstr "Rapport navn"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_cash
@@ -7914,13 +8089,13 @@
 #: code:addons/account/account.py:3092
 #, python-format
 msgid "Cash"
-msgstr ""
+msgstr "Kontanter"
 
 #. module: account
 #: field:account.fiscal.position.account,account_dest_id:0
 #: field:account.fiscal.position.account.template,account_dest_id:0
 msgid "Account Destination"
-msgstr ""
+msgstr "Konto destination"
 
 #. module: account
 #: help:account.invoice.refund,filter_refund:0
@@ -7940,22 +8115,22 @@
 #: field:account.tax.code,sequence:0
 #: field:account.tax.template,sequence:0
 msgid "Sequence"
-msgstr ""
+msgstr "Rækkefølge"
 
 #. module: account
 #: field:account.config.settings,paypal_account:0
 msgid "Paypal account"
-msgstr ""
+msgstr "Paypal konto"
 
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
-msgstr ""
+msgstr "Journalindtastnings nummer"
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Parent Report"
-msgstr ""
+msgstr "Hoved rapport"
 
 #. module: account
 #: constraint:account.account:0
@@ -7973,7 +8148,7 @@
 #. module: account
 #: help:account.invoice,move_id:0
 msgid "Link to the automatically generated Journal Items."
-msgstr ""
+msgstr "Link til automatisk oprettede posteringer"
 
 #. module: account
 #: model:ir.model,name:account.model_account_config_settings
@@ -7984,24 +8159,24 @@
 #: selection:account.config.settings,period:0
 #: selection:account.installer,period:0
 msgid "Monthly"
-msgstr ""
+msgstr "Månedlig"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_asset
 msgid "Asset"
-msgstr ""
+msgstr "Aktiv"
 
 #. module: account
 #: field:account.bank.statement,balance_end:0
 msgid "Computed Balance"
-msgstr ""
+msgstr "Beregnet Balance"
 
 #. module: account
 #. openerp-web
 #: code:addons/account/static/src/js/account_move_reconciliation.js:89
 #, python-format
 msgid "You must choose at least one record."
-msgstr ""
+msgstr "Du skal vælge mindst en post."
 
 #. module: account
 #: field:account.account,parent_id:0
@@ -8013,7 +8188,7 @@
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Profit"
-msgstr ""
+msgstr "Fortjeneste"
 
 #. module: account
 #: help:account.payment.term.line,days2:0
@@ -8029,9 +8204,22 @@
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconciliation Transactions"
+msgstr "Udlignings transaktioner"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: code:addons/account/account_invoice.py:472
+#, python-format
+msgid ""
+"You cannot delete an invoice which is not draft or cancelled. You should "
+"refund it instead."
 msgstr ""
+"Du kan ikke slette en faktura der ikke er i kladdestatus eller annulleret. "
+"Kreditér den i stedet."
 
 #. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
 msgid "Legal Reports"
 msgstr ""
@@ -8067,7 +8255,7 @@
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
-msgstr ""
+msgstr "Partner regnskab"
 
 #. module: account
 #: selection:account.tax.template,type:0
@@ -8087,17 +8275,17 @@
 #: help:account.bank.statement,message_unread:0
 #: help:account.invoice,message_unread:0
 msgid "If checked new messages require your attention."
-msgstr ""
+msgstr "Hvis afmærket, kræver nye beskeder din attention"
 
 #. module: account
 #: field:res.company,tax_calculation_rounding_method:0
 msgid "Tax Calculation Rounding Method"
-msgstr ""
+msgstr "Moms afrundingsmetode"
 
 #. module: account
 #: field:account.entries.report,move_line_state:0
 msgid "State of Move Line"
-msgstr ""
+msgstr "Status på flytte-linie"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile
@@ -8108,12 +8296,12 @@
 #: view:account.subscription.generate:0
 #: model:ir.model,name:account.model_account_subscription_generate
 msgid "Subscription Compute"
-msgstr ""
+msgstr "Abonnements beregning"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
 msgid "Open for Unreconciliation"
-msgstr ""
+msgstr "Åben af af-udligning"
 
 #. module: account
 #: field:account.bank.statement.line,partner_id:0
@@ -8138,23 +8326,23 @@
 #: model:ir.model,name:account.model_res_partner
 #: field:report.invoice.created,partner_id:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: account
 #: help:account.change.currency,currency_id:0
 msgid "Select a currency to apply on the invoice"
-msgstr ""
+msgstr "Vælg en valuta til fakturaen"
 
 #. module: account
 #: code:addons/account/account_invoice.py:901
 #, python-format
 msgid "No Invoice Lines !"
-msgstr ""
+msgstr "Ingen faktura linier !"
 
 #. module: account
 #: view:account.financial.report:0
 msgid "Report Type"
-msgstr ""
+msgstr "Rapport type"
 
 #. module: account
 #: help:account.open.closed.fiscalyear,fyear_id:0
@@ -8190,7 +8378,7 @@
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
 msgid "Automatic entry"
-msgstr ""
+msgstr "Automatisk postering"
 
 #. module: account
 #: help:account.account,reconcile:0
@@ -8213,12 +8401,12 @@
 #: view:account.analytic.line:0
 #: model:ir.actions.act_window,name:account.action_account_analytic_line_form
 msgid "Analytic Entries"
-msgstr ""
+msgstr "Analytiske posteringer"
 
 #. module: account
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr ""
+msgstr "Tilknyttet partner"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1465
@@ -8235,7 +8423,7 @@
 #: field:account.invoice.report,residual:0
 #: field:account.invoice.report,user_currency_residual:0
 msgid "Total Residual"
-msgstr ""
+msgstr "Totalt tilbageværende"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -8246,7 +8434,7 @@
 #: model:process.node,note:account.process_node_invoiceinvoice0
 #: model:process.node,note:account.process_node_supplierinvoiceinvoice0
 msgid "Invoice's state is Open"
-msgstr ""
+msgstr "Fakturaens status er Åben"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -8275,17 +8463,17 @@
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost
 #: model:ir.actions.report.xml,name:account.account_analytic_account_cost_ledger
 msgid "Cost Ledger"
-msgstr ""
+msgstr "Omkostnings konto"
 
 #. module: account
 #: view:account.config.settings:0
 msgid "No Fiscal Year Defined for This Company"
-msgstr ""
+msgstr "Intet regnskabsår er oprettet for dette firma"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma"
-msgstr ""
+msgstr "Proforma"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -8305,13 +8493,13 @@
 #: code:addons/account/account.py:3196
 #, python-format
 msgid "Purchase Refund Journal"
-msgstr ""
+msgstr "Indkøbs kreditnota journal"
 
 #. module: account
 #: code:addons/account/account.py:1333
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "Vælg en bilagsserie på journalen"
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -8326,12 +8514,12 @@
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by Invoice Date"
-msgstr ""
+msgstr "Sorter efter faktura dato"
 
 #. module: account
 #: help:account.journal,user_id:0
 msgid "The user responsible for this journal"
-msgstr ""
+msgstr "Brugeren er ansvarlig for denne journal"
 
 #. module: account
 #: help:account.config.settings,module_account_followup:0
@@ -8382,32 +8570,32 @@
 #: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
-msgstr ""
+msgstr "Vælg en start- og slutperiode."
 
 #. module: account
 #: field:account.config.settings,sale_sequence_next:0
 msgid "Next invoice number"
-msgstr ""
+msgstr "Næste faktura nummer"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
 msgid "Generic Reporting"
-msgstr ""
+msgstr "Generisk rapportering"
 
 #. module: account
 #: field:account.move.line.reconcile.writeoff,journal_id:0
 msgid "Write-Off Journal"
-msgstr ""
+msgstr "Afskrivnings journal"
 
 #. module: account
 #: field:account.chart.template,property_account_income_categ:0
 msgid "Income Category Account"
-msgstr ""
+msgstr "Omsætnings kategori konto"
 
 #. module: account
 #: field:account.account,adjusted_balance:0
 msgid "Adjusted Balance"
-msgstr ""
+msgstr "Justeret balance"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_template_form
@@ -8459,24 +8647,24 @@
 #: field:account.vat.declaration,chart_account_id:0
 #: field:accounting.report,chart_account_id:0
 msgid "Chart of Account"
-msgstr ""
+msgstr "Konto oversigt"
 
 #. module: account
 #: model:process.node,name:account.process_node_paymententries0
 #: model:process.transition,name:account.process_transition_reconcilepaid0
 msgid "Payment"
-msgstr ""
+msgstr "Betaling"
 
 #. module: account
 #: view:account.automatic.reconcile:0
 msgid "Reconciliation Result"
-msgstr ""
+msgstr "Afstemnings/udlignings resultat"
 
 #. module: account
 #: field:account.bank.statement,balance_end_real:0
 #: field:account.treasury.report,ending_balance:0
 msgid "Ending Balance"
-msgstr ""
+msgstr "Afslutnings balance"
 
 #. module: account
 #: field:account.journal,centralisation:0
@@ -8520,7 +8708,7 @@
 #. module: account
 #: model:process.transition,name:account.process_transition_filestatement0
 msgid "Automatic import of the bank sta"
-msgstr ""
+msgstr "Automatisk import af bank-udtog"
 
 #. module: account
 #: code:addons/account/account_invoice.py:381
@@ -8536,7 +8724,7 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Tilføj"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
@@ -8575,12 +8763,12 @@
 #: model:process.node,name:account.process_node_supplierreconciliation0
 #, python-format
 msgid "Reconciliation"
-msgstr ""
+msgstr "Udlingning/afstemning"
 
 #. module: account
 #: view:account.tax.template:0
 msgid "Keep empty to use the income account"
-msgstr ""
+msgstr "Efterlad tom for at anvende omsætningskontoen"
 
 #. module: account
 #: view:account.invoice:0
@@ -8615,12 +8803,12 @@
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr ""
+msgstr "Regnskabsår luknings status"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
 msgid "Refund Journal"
-msgstr ""
+msgstr "Krediterings journal"
 
 #. module: account
 #: report:account.account.balance:0
@@ -8630,7 +8818,7 @@
 #: report:account.general.ledger_landscape:0
 #: report:account.partner.balance:0
 msgid "Filter By"
-msgstr ""
+msgstr "Sorter efter"
 
 #. module: account
 #: code:addons/account/wizard/account_period_close.py:51
@@ -8638,18 +8826,22 @@
 msgid ""
 "In order to close a period, you must first post related journal entries."
 msgstr ""
+<<<<<<< TREE
+=======
+"For at lukke en periode, skal du først bogføre relaterede bogføringskladder."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.entries.report:0
 #: view:board.board:0
 #: model:ir.actions.act_window,name:account.action_company_analysis_tree
 msgid "Company Analysis"
-msgstr ""
+msgstr "Firma analyse"
 
 #. module: account
 #: help:account.invoice,account_id:0
 msgid "The partner account used for this invoice."
-msgstr ""
+msgstr "Partner konto bag denne faktura."
 
 #. module: account
 #: code:addons/account/account.py:3391
@@ -8662,28 +8854,28 @@
 #: view:account.tax.code.template:0
 #: field:account.tax.code.template,parent_id:0
 msgid "Parent Code"
-msgstr ""
+msgstr "Basis kode"
 
 #. module: account
 #: model:ir.model,name:account.model_account_payment_term_line
 msgid "Payment Term Line"
-msgstr ""
+msgstr "Betalingsbetingelse linie"
 
 #. module: account
 #: code:addons/account/account.py:3194
 #, python-format
 msgid "Purchase Journal"
-msgstr ""
+msgstr "Indkøbs journal"
 
 #. module: account
 #: field:account.invoice,amount_untaxed:0
 msgid "Subtotal"
-msgstr ""
+msgstr "Subtotal"
 
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr ""
+msgstr "Udskriv moms oversigt"
 
 #. module: account
 #: view:account.model.line:0
@@ -8703,12 +8895,21 @@
 #: model:ir.ui.menu,name:account.menu_account_supplier
 #: model:ir.ui.menu,name:account.menu_finance_payables
 msgid "Suppliers"
-msgstr ""
+msgstr "Leverandører"
 
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
+<<<<<<< TREE
 msgstr ""
+=======
+msgstr "Tilladte konto typer (tom hvis ingen kontrol)"
+
+#. module: account
+#: view:account.payment.term:0
+msgid "Payment term explanation for the customer..."
+msgstr "Betalingsbetingelse forklaring for kunden"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: help:account.move.line,amount_residual:0
@@ -8720,13 +8921,13 @@
 #. module: account
 #: view:account.tax.code:0
 msgid "Statistics"
-msgstr ""
+msgstr "Statistik"
 
 #. module: account
 #: field:account.analytic.chart,from_date:0
 #: field:project.account.analytic.line,from_date:0
 msgid "From"
-msgstr ""
+msgstr "Fra"
 
 #. module: account
 #: help:accounting.report,debit_credit:0
@@ -8739,7 +8940,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close
 msgid "Fiscalyear Close"
-msgstr ""
+msgstr "Regnskabsår lukning"
 
 #. module: account
 #: sql_constraint:account.account:0
@@ -8756,12 +8957,12 @@
 #: view:account.invoice:0
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_invoice_opened
 msgid "Unpaid Invoices"
-msgstr ""
+msgstr "Ubetalte fakturaer"
 
 #. module: account
 #: field:account.move.line.reconcile,debit:0
 msgid "Debit amount"
-msgstr ""
+msgstr "Debit beløb"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -8773,12 +8974,12 @@
 #: view:account.common.report:0
 #: view:account.invoice:0
 msgid "Print"
-msgstr ""
+msgstr "Udskriv"
 
 #. module: account
 #: view:account.period.close:0
 msgid "Are you sure?"
-msgstr ""
+msgstr "Er du sikker?"
 
 #. module: account
 #: view:account.journal:0
@@ -8788,14 +8989,14 @@
 #. module: account
 #: field:account.config.settings,sale_tax_rate:0
 msgid "Sales tax (%)"
-msgstr ""
+msgstr "Salgs moms (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
 #: model:ir.actions.act_window,name:account.action_account_analytic_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Chart of Analytic Accounts"
-msgstr ""
+msgstr "Analytisk konto oversigt"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -8818,36 +9019,36 @@
 #: view:account.journal:0
 #: model:ir.ui.menu,name:account.menu_configuration_misc
 msgid "Miscellaneous"
-msgstr ""
+msgstr "Diverse"
 
 #. module: account
 #: help:res.partner,debit:0
 msgid "Total amount you have to pay to this supplier."
-msgstr ""
+msgstr "Total beløb du skal betale denne leverandør."
 
 #. module: account
 #: model:process.node,name:account.process_node_analytic0
 #: model:process.node,name:account.process_node_analyticcost0
 msgid "Analytic Costs"
-msgstr ""
+msgstr "Analytiske omkostninger"
 
 #. module: account
 #: field:account.analytic.journal,name:0
 #: report:account.general.journal:0
 #: field:account.journal,name:0
 msgid "Journal Name"
-msgstr ""
+msgstr "Journal navn"
 
 #. module: account
 #: code:addons/account/account_move_line.py:829
 #, python-format
 msgid "Entry \"%s\" is not valid !"
-msgstr ""
+msgstr "Indtastning \"%s\" er ikke valid !"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Smallest Text"
-msgstr ""
+msgstr "Mindste skrift"
 
 #. module: account
 #: help:account.config.settings,module_account_check_writing:0
@@ -8920,7 +9121,7 @@
 #: field:res.partner.bank,currency_id:0
 #: field:wizard.multi.charts.accounts,currency_id:0
 msgid "Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account
 #: help:account.invoice.refund,journal_id:0
@@ -8945,29 +9146,29 @@
 #: view:account.entries.report:0
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_reconcile_open
 msgid "Reconciled entries"
-msgstr ""
+msgstr "Udlignede posteringer"
 
 #. module: account
 #: code:addons/account/account.py:2334
 #, python-format
 msgid "Wrong model !"
-msgstr ""
+msgstr "Forkert model !"
 
 #. module: account
 #: view:account.tax.code.template:0
 #: view:account.tax.template:0
 msgid "Tax Template"
-msgstr ""
+msgstr "Moms skabelon"
 
 #. module: account
 #: field:account.invoice.refund,period:0
 msgid "Force period"
-msgstr ""
+msgstr "Gennemtving periode"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr ""
+msgstr "Udskriv partner balance"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1121
@@ -8991,7 +9192,7 @@
 #. module: account
 #: field:res.partner,contract_ids:0
 msgid "Contracts"
-msgstr ""
+msgstr "Kontrakter"
 
 #. module: account
 #: field:account.cashbox.line,bank_statement_id:0
@@ -9000,14 +9201,14 @@
 #: field:account.financial.report,credit:0
 #: field:account.financial.report,debit:0
 msgid "unknown"
-msgstr ""
+msgstr "ukendt"
 
 #. module: account
 #: field:account.fiscalyear.close,journal_id:0
 #: code:addons/account/account.py:3198
 #, python-format
 msgid "Opening Entries Journal"
-msgstr ""
+msgstr "Åbnings journal"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
@@ -9018,14 +9219,14 @@
 #: field:account.bank.statement,message_is_follower:0
 #: field:account.invoice,message_is_follower:0
 msgid "Is a Follower"
-msgstr ""
+msgstr "Er en \"follower\""
 
 #. module: account
 #: view:account.move:0
 #: field:account.move,narration:0
 #: field:account.move.line,narration:0
 msgid "Internal Note"
-msgstr ""
+msgstr "Intern note"
 
 #. module: account
 #: constraint:account.account:0
@@ -9038,7 +9239,7 @@
 #. module: account
 #: field:account.config.settings,has_fiscal_year:0
 msgid "Company has a fiscal year"
-msgstr ""
+msgstr "Firmaet har et regnskabsår"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -9052,34 +9253,34 @@
 #: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
-msgstr ""
+msgstr "Du kan ikke in-aktivere en konto med posteringer."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
 msgid "Given by Python Code"
-msgstr ""
+msgstr "Styret af Python programmering"
 
 #. module: account
 #: field:account.analytic.journal,code:0
 msgid "Journal Code"
-msgstr ""
+msgstr "Journal kode"
 
 #. module: account
 #: view:account.invoice:0
 #: field:account.move.line,amount_residual:0
 msgid "Residual Amount"
-msgstr ""
+msgstr "Tilbageværende beløb"
 
 #. module: account
 #: field:account.invoice,move_lines:0
 #: field:account.move.reconcile,line_id:0
 msgid "Entry Lines"
-msgstr ""
+msgstr "Indtastnings linier"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
 msgid "Open Journal"
-msgstr ""
+msgstr "Åben journal"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9091,24 +9292,24 @@
 #: report:account.analytic.account.journal:0
 #: report:account.analytic.account.quantity_cost_ledger:0
 msgid "Period from"
-msgstr ""
+msgstr "Periode fra"
 
 #. module: account
 #: field:account.cashbox.line,pieces:0
 msgid "Unit of Currency"
-msgstr ""
+msgstr "Valuta"
 
 #. module: account
 #: code:addons/account/account.py:3195
 #, python-format
 msgid "Sales Refund Journal"
-msgstr ""
+msgstr "Salgs kredit journal"
 
 #. module: account
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Information"
-msgstr ""
+msgstr "Information"
 
 #. module: account
 #: view:account.invoice.confirm:0
@@ -9123,22 +9324,22 @@
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
 msgid "Registered payment"
-msgstr ""
+msgstr "Registreret betaling"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close states of Fiscal year and periods"
-msgstr ""
+msgstr "Luk status på regnskabsår og perioder"
 
 #. module: account
 #: field:account.config.settings,purchase_refund_journal_id:0
 msgid "Purchase refund journal"
-msgstr ""
+msgstr "Indkøbs kredit journal"
 
 #. module: account
 #: view:account.analytic.line:0
 msgid "Product Information"
-msgstr ""
+msgstr "Produktinformation"
 
 #. module: account
 #: report:account.analytic.account.journal:0
@@ -9146,29 +9347,29 @@
 #: view:account.move.line:0
 #: model:ir.ui.menu,name:account.next_id_40
 msgid "Analytic"
-msgstr ""
+msgstr "Analytisk"
 
 #. module: account
 #: model:process.node,name:account.process_node_invoiceinvoice0
 #: model:process.node,name:account.process_node_supplierinvoiceinvoice0
 msgid "Create Invoice"
-msgstr ""
+msgstr "Dan faktura"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_configuration_installer
 msgid "Configure Accounting Data"
-msgstr ""
+msgstr "Opsæt regnskabs data"
 
 #. module: account
 #: field:wizard.multi.charts.accounts,purchase_tax_rate:0
 msgid "Purchase Tax(%)"
-msgstr ""
+msgstr "Indkøbs moms(%)"
 
 #. module: account
 #: code:addons/account/account_invoice.py:901
 #, python-format
 msgid "Please create some invoice lines."
-msgstr ""
+msgstr "Venligst opret faktura linier."
 
 #. module: account
 #: code:addons/account/wizard/pos_box.py:36
@@ -9181,7 +9382,7 @@
 #. module: account
 #: field:account.vat.declaration,display_detail:0
 msgid "Display Detail"
-msgstr ""
+msgstr "Vis detaljer"
 
 #. module: account
 #: code:addons/account/account.py:3203
@@ -9200,7 +9401,7 @@
 #: view:account.analytic.line:0
 #: view:analytic.entries.report:0
 msgid "My Entries"
-msgstr ""
+msgstr "Mine indtastninger"
 
 #. module: account
 #: help:account.invoice,state:0
@@ -9220,7 +9421,7 @@
 #: field:account.period,date_stop:0
 #: model:ir.ui.menu,name:account.menu_account_end_year_treatments
 msgid "End of Period"
-msgstr ""
+msgstr "Slut på periode"
 
 #. module: account
 #: field:account.account,financial_report_ids:0
@@ -9229,7 +9430,7 @@
 #: model:ir.actions.act_window,name:account.action_account_report
 #: model:ir.ui.menu,name:account.menu_account_reports
 msgid "Financial Reports"
-msgstr ""
+msgstr "Finans rapporter"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_liability_view1
@@ -9262,7 +9463,7 @@
 #: field:accounting.report,period_from:0
 #: field:accounting.report,period_from_cmp:0
 msgid "Start Period"
-msgstr ""
+msgstr "Start periode"
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_central_journal
@@ -9277,12 +9478,12 @@
 #. module: account
 #: field:res.partner,ref_companies:0
 msgid "Companies that refers to partner"
-msgstr ""
+msgstr "Firmaer med relation til partneren"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Ask Refund"
-msgstr ""
+msgstr "Udbed kreditnota"
 
 #. module: account
 #: view:account.move.line:0
@@ -9297,28 +9498,28 @@
 #. module: account
 #: field:account.subscription,period_total:0
 msgid "Number of Periods"
-msgstr ""
+msgstr "Antal perioder"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Document: Customer account statement"
-msgstr ""
+msgstr "Dokument: Kunde konto udtog"
 
 #. module: account
 #: view:account.account.template:0
 msgid "Receivale Accounts"
-msgstr ""
+msgstr "Debitor konti"
 
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_prefix:0
 msgid "Supplier credit note sequence"
-msgstr ""
+msgstr "Leverandør kreditnota bilagsserie"
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:37
 #, python-format
 msgid "Invoice is already reconciled."
-msgstr ""
+msgstr "Fakturaen er allerede udlignet."
 
 #. module: account
 #: help:account.config.settings,module_account_payment:0
@@ -9334,13 +9535,13 @@
 #. module: account
 #: xsl:account.transfer:0
 msgid "Document"
-msgstr ""
+msgstr "Dokument"
 
 #. module: account
 #: view:account.chart.template:0
 #: field:account.chart.template,property_account_receivable:0
 msgid "Receivable Account"
-msgstr ""
+msgstr "Debitor konto"
 
 #. module: account
 #: code:addons/account/account_move_line.py:771
@@ -9348,6 +9549,8 @@
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
 msgstr ""
+"For at udligne/afstemme posteringerne skal firma være det samme på alle "
+"posteringer."
 
 #. module: account
 #: field:account.account,balance:0
@@ -9373,18 +9576,18 @@
 #: field:report.account.receivable,balance:0
 #: field:report.aged.receivable,balance:0
 msgid "Balance"
-msgstr ""
+msgstr "Balance"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierbankstatement0
 msgid "Manually or automatically entered in the system"
-msgstr ""
+msgstr "Manuelt indtastet eller automatisk genereret i systemet"
 
 #. module: account
 #: report:account.account.balance:0
 #: report:account.general.ledger_landscape:0
 msgid "Display Account"
-msgstr ""
+msgstr "Vis Konto"
 
 #. module: account
 #: selection:account.account,type:0
@@ -9395,6 +9598,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:account.account:0
+msgid "Account name"
+msgstr "Kontonavn"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:board.board:0
 msgid "Account Board"
 msgstr ""
@@ -9419,7 +9630,7 @@
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Filters By"
-msgstr ""
+msgstr "Filtrér efter"
 
 #. module: account
 #: field:account.cashbox.line,number_closing:0
@@ -9431,7 +9642,7 @@
 #: model:process.node,note:account.process_node_manually0
 #: model:process.transition,name:account.process_transition_invoicemanually0
 msgid "Manual entry"
-msgstr ""
+msgstr "Manuel indtastning"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -9442,19 +9653,19 @@
 #: view:account.move.line:0
 #: field:analytic.entries.report,move_id:0
 msgid "Move"
-msgstr ""
+msgstr "Flytning"
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:478
 #: code:addons/account/wizard/account_period_close.py:51
 #, python-format
 msgid "Invalid Action!"
-msgstr ""
+msgstr "Ulovlig handling!"
 
 #. module: account
 #: view:account.bank.statement:0
 msgid "Date / Period"
-msgstr ""
+msgstr "Dato / Periode"
 
 #. module: account
 #: report:account.central.journal:0
@@ -9464,7 +9675,7 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.act_account_journal_2_account_bank_statement
 msgid "Bank statements"
-msgstr ""
+msgstr "Bank kontoudtog"
 
 #. module: account
 #: constraint:account.period:0
@@ -9477,7 +9688,7 @@
 #. module: account
 #: report:account.overdue:0
 msgid "There is nothing due with this customer."
-msgstr ""
+msgstr "Kunden har intet forfaldent."
 
 #. module: account
 #: help:account.tax,account_paid_id:0
@@ -9495,12 +9706,12 @@
 #. module: account
 #: report:account.invoice:0
 msgid "Source"
-msgstr ""
+msgstr "Kilde"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
 msgid "Date of the day"
-msgstr ""
+msgstr "Dagens dato"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:49
@@ -9520,7 +9731,7 @@
 #. module: account
 #: field:account.invoice,sent:0
 msgid "Sent"
-msgstr ""
+msgstr "Sendt"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_common_menu
@@ -9531,12 +9742,12 @@
 #: field:account.config.settings,default_sale_tax:0
 #: field:account.config.settings,sale_tax:0
 msgid "Default sale tax"
-msgstr ""
+msgstr "Standard salgs moms"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Balance :"
-msgstr ""
+msgstr "Balance :"
 
 #. module: account
 #: code:addons/account/account.py:1587
@@ -9547,7 +9758,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodic Processing"
-msgstr ""
+msgstr "Periodisk behandling"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -9559,7 +9770,7 @@
 #: model:process.transition,name:account.process_transition_paymentorderbank0
 #: model:process.transition,name:account.process_transition_paymentreconcile0
 msgid "Payment entries"
-msgstr ""
+msgstr "Betalings posteringer"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9568,7 +9779,7 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #. module: account
 #: view:account.account:0
@@ -9578,12 +9789,12 @@
 #. module: account
 #: field:account.subscription.line,subscription_id:0
 msgid "Subscription"
-msgstr ""
+msgstr "Abonnement"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_balance
 msgid "Account Analytic Balance"
-msgstr ""
+msgstr "Balance for analytisk konto"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9611,23 +9822,23 @@
 #: field:accounting.report,period_to:0
 #: field:accounting.report,period_to_cmp:0
 msgid "End Period"
-msgstr ""
+msgstr "Slut periode"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_expense_view1
 msgid "Expense View"
-msgstr ""
+msgstr "Omkostnings visning"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
 msgid "Due date"
-msgstr ""
+msgstr "Forfaldsdato"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_immediate
 #: model:account.payment.term,note:account.account_payment_term_immediate
 msgid "Immediate Payment"
-msgstr ""
+msgstr "Straks betaling"
 
 #. module: account
 #: code:addons/account/account.py:1502
@@ -9649,17 +9860,17 @@
 #: view:account.subscription:0
 #: model:ir.model,name:account.model_account_subscription
 msgid "Account Subscription"
-msgstr ""
+msgstr "Konto for abonnement"
 
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity date"
-msgstr ""
+msgstr "Forældelses dato"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Entry Subscription"
-msgstr ""
+msgstr "Abonnements indtastning"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9689,7 +9900,7 @@
 #: field:accounting.report,date_from:0
 #: field:accounting.report,date_from_cmp:0
 msgid "Start Date"
-msgstr ""
+msgstr "Start dato"
 
 #. module: account
 #: help:account.invoice,reconciled:0
@@ -9703,31 +9914,41 @@
 #: view:account.invoice.report:0
 #: model:process.node,name:account.process_node_supplierdraftinvoices0
 msgid "Draft Invoices"
-msgstr ""
-
-#. module: account
+msgstr "Faktura kladder"
+
+#. module: account
+<<<<<<< TREE
+=======
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
+#, python-format
+msgid "Nothing more to reconcile"
+msgstr "Ikke mere at udligne"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:cash.box.in:0
 #: model:ir.actions.act_window,name:account.action_cash_box_in
 msgid "Put Money In"
-msgstr ""
+msgstr "Læg penge i"
 
 #. module: account
 #: selection:account.account.type,close_method:0
 #: view:account.entries.report:0
 #: view:account.move.line:0
 msgid "Unreconciled"
-msgstr ""
+msgstr "Uudlignet"
 
 #. module: account
 #: code:addons/account/account_invoice.py:922
 #, python-format
 msgid "Bad total !"
-msgstr ""
+msgstr "Forkert total !"
 
 #. module: account
 #: field:account.journal,sequence_id:0
 msgid "Entry Sequence"
-msgstr ""
+msgstr "Bilagsserie"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period_tree
@@ -9744,29 +9965,29 @@
 #. module: account
 #: view:account.analytic.account:0
 msgid "Pending"
-msgstr ""
+msgstr "Afventer"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_cost_ledger_journal
 #: model:ir.actions.report.xml,name:account.account_analytic_account_quantity_cost_ledger
 msgid "Cost Ledger (Only quantities)"
-msgstr ""
+msgstr "Omkostnings konto (kun antal)"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr ""
+msgstr "Fra analytiske konti"
 
 #. module: account
 #: view:account.installer:0
 msgid "Configure your Fiscal Year"
-msgstr ""
+msgstr "Opsæt dit regnskabsår"
 
 #. module: account
 #: field:account.period,name:0
 msgid "Period Name"
-msgstr ""
+msgstr "Periode navn"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_state.py:68
@@ -9801,7 +10022,7 @@
 #. module: account
 #: view:accounting.report:0
 msgid "Comparison"
-msgstr ""
+msgstr "Sammenligning"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1119
@@ -9837,19 +10058,19 @@
 #. module: account
 #: field:account.period,special:0
 msgid "Opening/Closing Period"
-msgstr ""
+msgstr "Åbnings-/luknings periode"
 
 #. module: account
 #: field:account.account,currency_id:0
 #: field:account.account.template,currency_id:0
 #: field:account.bank.accounts.wizard,currency_id:0
 msgid "Secondary Currency"
-msgstr ""
+msgstr "Sekundær valuta"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move
 msgid "Validate Account Move"
-msgstr ""
+msgstr "Godkend konto flytning"
 
 #. module: account
 #: field:account.account,credit:0
@@ -9873,12 +10094,12 @@
 #: report:account.vat.declaration:0
 #: field:report.account.receivable,credit:0
 msgid "Credit"
-msgstr ""
+msgstr "Kredit"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Invoice "
-msgstr ""
+msgstr "Proforma faktura "
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
@@ -9888,7 +10109,7 @@
 #. module: account
 #: view:account.model:0
 msgid "Journal Entry Model"
-msgstr ""
+msgstr "Journal indtastnings model"
 
 #. module: account
 #: code:addons/account/account.py:1073
@@ -9915,7 +10136,7 @@
 #: field:account.invoice.report,price_total:0
 #: field:account.invoice.report,user_currency_price_total:0
 msgid "Total Without Tax"
-msgstr ""
+msgstr "Total før moms"
 
 #. module: account
 #: selection:account.aged.trial.balance,filter:0
@@ -9946,20 +10167,28 @@
 #: model:ir.ui.menu,name:account.menu_action_account_period
 #: model:ir.ui.menu,name:account.next_id_23
 msgid "Periods"
-msgstr ""
+msgstr "Perioder"
 
 #. module: account
 #: field:account.invoice.report,currency_rate:0
 msgid "Currency Rate"
-msgstr ""
-
-#. module: account
+msgstr "Valuta kurs"
+
+#. module: account
+<<<<<<< TREE
+=======
+#: view:account.config.settings:0
+msgid "e.g. sales@xxxxxxxxxxx"
+msgstr "F.eks. sales@xxxxxxxxxx"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.account,tax_ids:0
 #: view:account.account.template:0
 #: field:account.account.template,tax_ids:0
 #: view:account.chart.template:0
 msgid "Default Taxes"
-msgstr ""
+msgstr "Standard moms"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -9968,12 +10197,12 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "April"
-msgstr ""
+msgstr "April"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_profitloss_toreport0
 msgid "Profit (Loss) to report"
-msgstr ""
+msgstr "Tab/vind til rapportering"
 
 #. module: account
 #: code:addons/account/account_invoice.py:379
@@ -9984,7 +10213,7 @@
 #. module: account
 #: view:account.move.line.reconcile.select:0
 msgid "Open for Reconciliation"
-msgstr ""
+msgstr "Åben for udligning"
 
 #. module: account
 #: field:account.account,parent_left:0
@@ -10016,7 +10245,7 @@
 #: field:report.account.sales,product_id:0
 #: field:report.account_type.sales,product_id:0
 msgid "Product"
-msgstr ""
+msgstr "Vare"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_validate_account_move
@@ -10029,19 +10258,19 @@
 #. module: account
 #: model:ir.model,name:account.model_account_period
 msgid "Account period"
-msgstr ""
+msgstr "Konto periode"
 
 #. module: account
 #: view:account.subscription:0
 msgid "Remove Lines"
-msgstr ""
+msgstr "Fjern linier"
 
 #. module: account
 #: selection:account.account,type:0
 #: selection:account.account.template,type:0
 #: selection:account.entries.report,type:0
 msgid "Regular"
-msgstr ""
+msgstr "Almindelig"
 
 #. module: account
 #: view:account.account:0
@@ -10050,17 +10279,17 @@
 #: field:account.account.template,type:0
 #: field:account.entries.report,type:0
 msgid "Internal Type"
-msgstr ""
+msgstr "Intern type"
 
 #. module: account
 #: field:account.subscription.generate,date:0
 msgid "Generate Entries Before"
-msgstr ""
+msgstr "Dan posteringer før"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
 msgid "Running Subscriptions"
-msgstr ""
+msgstr "Aktive abonnementer"
 
 #. module: account
 #: view:account.analytic.balance:0
@@ -10068,7 +10297,7 @@
 #: view:account.analytic.inverted.balance:0
 #: view:account.analytic.journal.report:0
 msgid "Select Period"
-msgstr ""
+msgstr "Vælg periode"
 
 #. module: account
 #: view:account.entries.report:0
@@ -10077,7 +10306,7 @@
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Posted"
-msgstr ""
+msgstr "Posteret"
 
 #. module: account
 #: report:account.account.balance:0
@@ -10106,7 +10335,7 @@
 #: field:accounting.report,date_to:0
 #: field:accounting.report,date_to_cmp:0
 msgid "End Date"
-msgstr ""
+msgstr "Slut dato"
 
 #. module: account
 #: view:account.open.closed.fiscalyear:0
@@ -10153,12 +10382,12 @@
 #: 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 ""
+msgstr "Denne konto bruge til at værdiansætte udgående lager til salgspris."
 
 #. module: account
 #: field:account.invoice,check_total:0
 msgid "Verification Total"
-msgstr ""
+msgstr "Afstemnings total"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -10170,7 +10399,7 @@
 #: field:report.account_type.sales,amount_total:0
 #: field:report.invoice.created,amount_total:0
 msgid "Total"
-msgstr ""
+msgstr "Total"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:109
@@ -10181,7 +10410,7 @@
 #. module: account
 #: field:account.tax,account_analytic_paid_id:0
 msgid "Refund Tax Analytic Account"
-msgstr ""
+msgstr "Moms refusion analytisk konto"
 
 #. module: account
 #: view:account.move.bank.reconcile:0
@@ -10235,24 +10464,24 @@
 #: field:analytic.entries.report,company_id:0
 #: field:wizard.multi.charts.accounts,company_id:0
 msgid "Company"
-msgstr ""
+msgstr "Firma"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_action_subscription_form
 msgid "Define Recurring Entries"
-msgstr ""
+msgstr "Definer gentagne posteringer"
 
 #. module: account
 #: field:account.entries.report,date_maturity:0
 msgid "Date Maturity"
-msgstr ""
+msgstr "Forældelses dato"
 
 #. module: account
 #: field:account.invoice.refund,description:0
 #: field:cash.box.in,name:0
 #: field:cash.box.out,name:0
 msgid "Reason"
-msgstr ""
+msgstr "Årsag"
 
 #. module: account
 #: selection:account.partner.ledger,filter:0
@@ -10260,7 +10489,7 @@
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
-msgstr ""
+msgstr "Uudlignede posteringer"
 
 #. module: account
 #: help:account.partner.reconcile.process,today_reconciled:0
@@ -10273,7 +10502,7 @@
 #. module: account
 #: view:account.fiscalyear:0
 msgid "Create Monthly Periods"
-msgstr ""
+msgstr "Opret månedlige perioder"
 
 #. module: account
 #: field:account.tax.code.template,sign:0
@@ -10283,12 +10512,12 @@
 #. module: account
 #: model:ir.model,name:account.model_account_balance_report
 msgid "Trial Balance Report"
-msgstr ""
+msgstr "Råbalance rapport"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_draft_tree
 msgid "Draft statements"
-msgstr ""
+msgstr "Kladde oversigter"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_statemententries0
@@ -10322,12 +10551,12 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Invoice lines"
-msgstr ""
+msgstr "Faktura linier"
 
 #. module: account
 #: field:account.chart,period_to:0
 msgid "End period"
-msgstr ""
+msgstr "Slut periode"
 
 #. module: account
 #: sql_constraint:account.journal:0
@@ -10345,28 +10574,28 @@
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to Next Partner"
-msgstr ""
+msgstr "Gå til næste partner"
 
 #. module: account
 #: view:account.automatic.reconcile:0
 #: view:account.move.line.reconcile.writeoff:0
 msgid "Write-Off Move"
-msgstr ""
+msgstr "Afskrivnings flytning"
 
 #. module: account
 #: model:process.node,note:account.process_node_paidinvoice0
 msgid "Invoice's state is Done"
-msgstr ""
+msgstr "Fakturaens status er Udført"
 
 #. module: account
 #: field:account.config.settings,module_account_followup:0
 msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "Styr kundebetalings opfølgning"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
 msgid "Report of the Sales by Account"
-msgstr ""
+msgstr "Salgsrapport pr. konto"
 
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
@@ -10383,7 +10612,7 @@
 #: selection:report.invoice.created,type:0
 #, python-format
 msgid "Supplier Invoice"
-msgstr ""
+msgstr "Leverandør faktura"
 
 #. module: account
 #: field:account.account,debit:0
@@ -10407,7 +10636,7 @@
 #: report:account.vat.declaration:0
 #: field:report.account.receivable,debit:0
 msgid "Debit"
-msgstr ""
+msgstr "Debet"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -10418,22 +10647,22 @@
 #: view:account.invoice:0
 #: field:account.invoice,invoice_line:0
 msgid "Invoice Lines"
-msgstr ""
+msgstr "Faktura linier"
 
 #. module: account
 #: help:account.model.line,quantity:0
 msgid "The optional quantity on entries."
-msgstr ""
+msgstr "De optionelle antal på posteringer"
 
 #. module: account
 #: field:account.automatic.reconcile,reconciled:0
 msgid "Reconciled transactions"
-msgstr ""
+msgstr "Udlignings posteringer"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_receivable
 msgid "Receivable accounts"
-msgstr ""
+msgstr "Kreditor konti"
 
 #. module: account
 #: code:addons/account/account_move_line.py:783
@@ -10449,7 +10678,7 @@
 #. module: account
 #: field:temp.range,name:0
 msgid "Range"
-msgstr ""
+msgstr "Interval"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -10473,17 +10702,17 @@
 #: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
-msgstr ""
+msgstr "Med flytninger"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr ""
+msgstr "Konto momskode skabelon"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
 msgid "Manually"
-msgstr ""
+msgstr "Manuelt"
 
 #. module: account
 #: help:account.move,balance:0
@@ -10498,24 +10727,25 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "December"
-msgstr ""
+msgstr "December"
 
 #. module: account
 #: view:account.invoice.report:0
 msgid "Group by month of Invoice Date"
-msgstr ""
+msgstr "Sorter på måned efter faktura datoen"
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:99
 #, python-format
 msgid "There is no income account defined for this product: \"%s\" (id:%d)."
 msgstr ""
+"Der er ikke angivet nogen indtægtskonto for denne vare:  \"%s\" (id:%d)."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_aged_receivable_graph
 #: view:report.aged.receivable:0
 msgid "Aged Receivable"
-msgstr ""
+msgstr "Forfalden debitorsaldo"
 
 #. module: account
 #: field:account.tax,applicable_type:0
@@ -10536,33 +10766,33 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing_billing
 msgid "Billing"
-msgstr ""
+msgstr "Fakturering"
 
 #. module: account
 #: view:account.account:0
 #: view:account.analytic.account:0
 msgid "Parent Account"
-msgstr ""
+msgstr "Basis konto"
 
 #. module: account
 #: view:report.account.receivable:0
 msgid "Accounts by Type"
-msgstr ""
+msgstr "Konti pr. type"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_chart
 msgid "Account Analytic Chart"
-msgstr ""
+msgstr "Analytisk kontooversigt"
 
 #. module: account
 #: help:account.invoice,residual:0
 msgid "Remaining amount due."
-msgstr ""
+msgstr "Tilbageværende forfaldent beløb"
 
 #. module: account
 #: field:account.print.journal,sort_selection:0
 msgid "Entries Sorted by"
-msgstr ""
+msgstr "Posteringer sorteret efter"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1546
@@ -10602,7 +10832,7 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_moves_all_a
@@ -10629,7 +10859,7 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "Install more chart templates"
-msgstr ""
+msgstr "Installer flere oversigts skabeloner"
 
 #. module: account
 #: report:account.general.journal:0
@@ -10640,7 +10870,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Search Invoice"
-msgstr ""
+msgstr "Søg faktura"
 
 #. module: account
 #: report:account.invoice:0
@@ -10649,7 +10879,7 @@
 #: code:addons/account/account_invoice.py:1159
 #, python-format
 msgid "Refund"
-msgstr ""
+msgstr "Tilbagebetaling"
 
 #. module: account
 #: model:ir.model,name:account.model_res_partner_bank
@@ -10659,12 +10889,12 @@
 #. module: account
 #: field:res.partner,credit:0
 msgid "Total Receivable"
-msgstr ""
+msgstr "Total debitor beløb"
 
 #. module: account
 #: view:account.move.line:0
 msgid "General Information"
-msgstr ""
+msgstr "Generelle oplysninger"
 
 #. module: account
 #: view:account.move:0
@@ -10683,7 +10913,7 @@
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
 msgid "Validate Account Move Lines"
-msgstr ""
+msgstr "Godkend konto flytnings linier"
 
 #. module: account
 #: help:res.partner,property_account_position:0
@@ -10694,28 +10924,28 @@
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
 msgid "Invoice's state is Done."
-msgstr ""
+msgstr "Fakturaens status er Udført"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_reconcilepaid0
 msgid "As soon as the reconciliation is done, the invoice can be paid."
-msgstr ""
+msgstr "Så snart afstemning er udført, kan fakturaen betales."
 
 #. module: account
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly."
-msgstr ""
+msgstr "Ny valuta er ikke konfigureret korrekt."
 
 #. module: account
 #: view:account.account.template:0
 msgid "Search Account Templates"
-msgstr ""
+msgstr "Søg konto skabeloner"
 
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Manual Invoice Taxes"
-msgstr ""
+msgstr "Manuel faktura moms"
 
 #. module: account
 #: code:addons/account/account_invoice.py:573
@@ -10734,7 +10964,7 @@
 #: code:addons/account/static/src/js/account_move_reconciliation.js:80
 #, python-format
 msgid "Never"
-msgstr ""
+msgstr "Aldrig"
 
 #. module: account
 #: model:ir.model,name:account.model_account_addtmpl_wizard
@@ -10750,19 +10980,19 @@
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Partner's"
-msgstr ""
+msgstr "Partnere"
 
 #. module: account
 #: field:account.account,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "Interne noter"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear
 #: view:ir.sequence:0
 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear
 msgid "Fiscal Years"
-msgstr ""
+msgstr "Finans år"
 
 #. module: account
 #: help:account.analytic.journal,active:0
@@ -10774,19 +11004,19 @@
 #. module: account
 #: field:account.analytic.line,ref:0
 msgid "Ref."
-msgstr ""
+msgstr "Ref."
 
 #. module: account
 #: field:account.use.model,model:0
 #: model:ir.model,name:account.model_account_model
 msgid "Account Model"
-msgstr ""
+msgstr "Konto model"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Loss"
-msgstr ""
+msgstr "Tab"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10795,7 +11025,7 @@
 #: selection:report.account.sales,month:0
 #: selection:report.account_type.sales,month:0
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -10810,7 +11040,7 @@
 #: field:account.invoice,partner_bank_id:0
 #: field:account.invoice.report,partner_bank_id:0
 msgid "Bank Account"
-msgstr ""
+msgstr "Bank konto"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_central_journal
@@ -10821,17 +11051,17 @@
 #. module: account
 #: report:account.overdue:0
 msgid "Maturity"
-msgstr ""
+msgstr "Forældelse"
 
 #. module: account
 #: selection:account.aged.trial.balance,direction_selection:0
 msgid "Future"
-msgstr ""
+msgstr "Fremtidig"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr ""
+msgstr "Søg i journal posteringer"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -10853,12 +11083,12 @@
 #. module: account
 #: field:account.chart.template,property_account_expense:0
 msgid "Expense Account on Product Template"
-msgstr ""
+msgstr "Vareforbrugskonto på Produkt skabelon"
 
 #. module: account
 #: field:res.partner,property_payment_term:0
 msgid "Customer Payment Term"
-msgstr ""
+msgstr "Kunde betalings betingelse"
 
 #. module: account
 #: help:accounting.report,label_filter:0

=== modified file 'account/i18n/fi.po'
--- account/i18n/fi.po	2013-10-18 12:58:18 +0000
+++ account/i18n/fi.po	2013-11-12 13:23:09 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:55+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+=======
+"POT-Creation-Date: 2013-06-14 22:29+0000\n"
+"PO-Revision-Date: 2013-11-08 21:29+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Finnish <fi@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-09-12 05:25+0000\n"
 "X-Generator: Launchpad (build 16761)\n"
+=======
+"X-Launchpad-Export-Date: 2013-11-10 06:43+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -26,7 +37,7 @@
 #: sql_constraint:account.fiscal.position.account:0
 msgid ""
 "An account fiscal position could be defined only once time on same accounts."
-msgstr ""
+msgstr "Tilin verokanta voidaan määritellä vain yhden kerran per tili."
 
 #. module: account
 #: help:account.tax.code,sequence:0
@@ -103,7 +114,7 @@
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:30
 #, python-format
 msgid "Reconcile"
-msgstr "Suoritus"
+msgstr "Täsmäytä"
 
 #. module: account
 #: field:account.bank.statement,name:0
@@ -123,8 +134,8 @@
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
-"Jos aktiivinen kenttä on tilassa epätosi (false), voit piilottaa maksun "
-"poistamatta sitä."
+"Jos aktiivinen kenttä on asetettu tilaan epätosi (false), niin voit "
+"piilottaa maksuehdon poistamatta sitä."
 
 #. module: account
 #: code:addons/account/account.py:641
@@ -185,7 +196,11 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_view_created_invoice_dashboard
 msgid "Invoices Created Within Past 15 Days"
+<<<<<<< TREE
 msgstr "Lasku muodostettu 15 päivän sisällä"
+=======
+msgstr "Viimeisten 15 päivän aikana luodut laskut"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:accounting.report,label_filter:0
@@ -267,6 +282,9 @@
 "sales, purchase, expense, contra, etc.\n"
 "                This installs the module account_voucher."
 msgstr ""
+"Tämä sisältää kaikki perusvaatimukset voucher-merkinnöiksi pankki, käteinen, "
+"osto, kulu, vasta etc.\n"
+"                Tämä asentaa account_voucher -moduulin."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_use_model_create_entry
@@ -1613,6 +1631,8 @@
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
 msgstr ""
+"Poistamalla valinnan aktiivisesta kentästä, voi verokannan piilottaa, "
+"kuitenkaan poistamatta sitä."
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
@@ -1655,7 +1675,11 @@
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_template
 msgid "Template for Fiscal Position"
+<<<<<<< TREE
 msgstr "Malli talouskannalle"
+=======
+msgstr "Verokannan malli"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.subscription:0
@@ -2193,7 +2217,7 @@
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
 msgid "A tax fiscal position could be defined only once time on same taxes."
-msgstr ""
+msgstr "Verokanta voidaan määritellä vain kerran samalle verolle."
 
 #. module: account
 #: view:account.tax:0
@@ -2366,7 +2390,7 @@
 #: model:account.payment.term,name:account.account_payment_term_net
 #: model:account.payment.term,note:account.account_payment_term_net
 msgid "30 Net Days"
-msgstr ""
+msgstr "30 päivää netto"
 
 #. module: account
 #: code:addons/account/account_cash_statement.py:256
@@ -2591,7 +2615,7 @@
 #: model:ir.actions.act_window,name:account.action_account_fiscal_position_form
 #: model:ir.ui.menu,name:account.menu_action_account_fiscal_position_form
 msgid "Fiscal Positions"
-msgstr "Talouskannat"
+msgstr "Verokanta"
 
 #. module: account
 #: code:addons/account/account_move_line.py:579
@@ -3075,7 +3099,7 @@
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr "Varokoodit"
+msgstr "Verokoodit"
 
 #. module: account
 #: view:account.account:0
@@ -3205,7 +3229,7 @@
 #: model:ir.model,name:account.model_account_fiscal_position
 #: field:res.partner,property_account_position:0
 msgid "Fiscal Position"
-msgstr "Talouskanta"
+msgstr "Verokanta"
 
 #. module: account
 #: code:addons/account/account_invoice.py:823
@@ -3383,7 +3407,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "Proforma laskut"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -4187,7 +4211,7 @@
 #. module: account
 #: field:account.move.line,date:0
 msgid "Effective date"
-msgstr "Tehokas päiväys"
+msgstr "Kirjauspäivä"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:100
@@ -4617,6 +4641,8 @@
 #: help:res.company,paypal_account:0
 msgid "Paypal username (usually email) for receiving online payments."
 msgstr ""
+"Paypal -käyttäjänimi (yleensä sähköpostiosoite) online-maksujen "
+"vastaanottamista varten."
 
 #. module: account
 #: selection:account.aged.trial.balance,target_move:0
@@ -4698,7 +4724,7 @@
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Main Title 1 (bold, underlined)"
-msgstr ""
+msgstr "Pääotsikko 1 (lihavoitu, alleviivattu)"
 
 #. module: account
 #: report:account.analytic.account.balance:0
@@ -5441,7 +5467,7 @@
 #. module: account
 #: field:account.journal,allow_date:0
 msgid "Check Date in Period"
-msgstr ""
+msgstr "Tarkista jakson päiväys"
 
 #. module: account
 #: model:ir.ui.menu,name:account.final_accounting_reports
@@ -5764,7 +5790,7 @@
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr ""
+msgstr "Kirjaamatta"
 
 #. module: account
 #: view:account.change.currency:0
@@ -5869,7 +5895,7 @@
 #: view:account.fiscal.position.template:0
 #: field:account.fiscal.position.template,name:0
 msgid "Fiscal Position Template"
-msgstr "Talouskannan malli"
+msgstr "Verokannan malli"
 
 #. module: account
 #: view:account.invoice:0
@@ -5901,7 +5927,7 @@
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
 msgid "Automatic formatting"
-msgstr ""
+msgstr "Automaattinen muotoilu"
 
 #. module: account
 #: view:account.move.line.reconcile:0
@@ -6203,7 +6229,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr ""
+msgstr "Verokannan malli"
 
 #. module: account
 #: help:account.tax,name:0
@@ -6262,7 +6288,7 @@
 #. module: account
 #: report:account.invoice:0
 msgid "Fiscal Position Remark :"
-msgstr "Tilikausiposition huomautus :"
+msgstr "Verokanta, huomautus:"
 
 #. module: account
 #: view:analytic.entries.report:0
@@ -7147,7 +7173,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Position"
-msgstr ""
+msgstr "Verokannat"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -7791,7 +7817,7 @@
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr ""
+msgstr "Kirjaamattomat päiväkirjamerkinnät"
 
 #. module: account
 #: help:account.invoice.refund,date:0
@@ -10095,7 +10121,7 @@
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Posted"
-msgstr "Postitettu"
+msgstr "Kirjattu"
 
 #. module: account
 #: report:account.account.balance:0

=== modified file 'account/i18n/hr.po'
--- account/i18n/hr.po	2013-10-21 14:53:34 +0000
+++ account/i18n/hr.po	2013-11-12 13:23:09 +0000
@@ -4,17 +4,31 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2013-01-27 15:12+0000\n"
 "Last-Translator: Davor Bojkić <bole@xxxxxxxxxx>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-14 22:29+0000\n"
+"PO-Revision-Date: 2013-10-24 07:59+0000\n"
+"Last-Translator: Marko Carevic <Unknown>\n"
+"Language-Team: Croatian <hr@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-09-12 05:32+0000\n"
 "X-Generator: Launchpad (build 16761)\n"
+=======
+"X-Launchpad-Export-Date: 2013-10-25 06:00+0000\n"
+"X-Generator: Launchpad (build 16810)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10625,7 +10639,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Invoice lines"
-msgstr "Stavke računa"
+msgstr "Stavke temeljnice"
 
 #. module: account
 #: field:account.chart,period_to:0

=== modified file 'account/i18n/hu.po'
--- account/i18n/hu.po	2013-09-12 06:40:18 +0000
+++ account/i18n/hu.po	2013-11-12 13:23:09 +0000
@@ -4,17 +4,31 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-27 22:48+0000\n"
 "Last-Translator: Balint (eSolve) <Unknown>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-14 22:29+0000\n"
+"PO-Revision-Date: 2013-11-10 18:34+0000\n"
+"Last-Translator: krnkris <Unknown>\n"
+"Language-Team: Hungarian <hu@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-09-12 05:27+0000\n"
 "X-Generator: Launchpad (build 16761)\n"
+=======
+"X-Launchpad-Export-Date: 2013-11-11 05:38+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -26,6 +40,8 @@
 msgid ""
 "An account fiscal position could be defined only once time on same accounts."
 msgstr ""
+"Egy könyvelés költségvetési évfordulóját csak egyszer lehet megadni az arra "
+"hivatkozó számlákra vonatkozólag."
 
 #. module: account
 #: help:account.tax.code,sequence:0
@@ -35,6 +51,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:res.partner:0
+msgid "the parent company"
+msgstr "a szülő vállalat"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
 msgstr "Könyvelési tétel párosítás"
@@ -60,7 +84,7 @@
 #: code:addons/account/account_bank_statement.py:369
 #, python-format
 msgid "Journal item \"%s\" is not valid."
-msgstr ""
+msgstr "A \"%s\" könyvelési napló tétel nem érvényes."
 
 #. module: account
 #: model:ir.model,name:account.model_report_aged_receivable
@@ -78,7 +102,7 @@
 #: code:addons/account/account_move_line.py:1210
 #, python-format
 msgid "Bad Account!"
-msgstr ""
+msgstr "Eltévesztett könyvelési számla!"
 
 #. module: account
 #: view:account.move:0
@@ -92,6 +116,8 @@
 "Error!\n"
 "You cannot create recursive account templates."
 msgstr ""
+"Hiba!\n"
+"Nem hozhat létre visszatérő számla sablonokat."
 
 #. module: account
 #. openerp-web
@@ -102,7 +128,7 @@
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:30
 #, python-format
 msgid "Reconcile"
-msgstr "Párosítás"
+msgstr "Egyeztetés"
 
 #. module: account
 #: field:account.bank.statement,name:0
@@ -114,7 +140,7 @@
 #: xsl:account.transfer:0
 #: field:cash.box.in,ref:0
 msgid "Reference"
-msgstr "Hivatkozás"
+msgstr "Információforrás"
 
 #. module: account
 #: help:account.payment.term,active:0
@@ -122,7 +148,8 @@
 "If the active field is set to False, it will allow you to hide the payment "
 "term without removing it."
 msgstr ""
-"Ha az aktív mező nincs bejelölve, nem használható a fizetési feltétel."
+"Ha az aktív mező hamisra van állatva, akkor a fizetési feltételt "
+"eltüntetheti anélkül, hogy törölné azt."
 
 #. module: account
 #: code:addons/account/account.py:641
@@ -151,7 +178,7 @@
 #: code:addons/account/account.py:3197
 #, python-format
 msgid "Miscellaneous Journal"
-msgstr "Vegyes napló"
+msgstr "Vegyes könyvelési napló"
 
 #. module: account
 #: code:addons/account/wizard/account_open_closed_fiscalyear.py:39
@@ -161,6 +188,8 @@
 "which is set after generating opening entries from 'Generate Opening "
 "Entries'."
 msgstr ""
+"Be kell állítania az 'Év végi belépő könyvelési naplót' ehhez a 'Nyitási "
+"tétel létrehozása' menüvel létrehozott üzlez év tételeihez."
 
 #. module: account
 #: field:account.fiscal.position.account,account_src_id:0
@@ -1475,7 +1504,7 @@
 #. module: account
 #: field:account.fiscalyear.close.state,fy_id:0
 msgid "Fiscal Year to Close"
-msgstr ""
+msgstr "Bezárni kívánt üzleti év"
 
 #. module: account
 #: field:account.config.settings,sale_sequence_prefix:0
@@ -1624,6 +1653,8 @@
 "By unchecking the active field, you may hide a fiscal position without "
 "deleting it."
 msgstr ""
+"Az aktív mező üresen hagyásával, eltüntetheti az ÁFA helyét, annak törlése "
+"nélkül."
 
 #. module: account
 #: model:ir.model,name:account.model_temp_range
@@ -2194,7 +2225,7 @@
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscal Year"
-msgstr ""
+msgstr "Üzleti év lezárása"
 
 #. module: account
 #. openerp-web
@@ -2207,6 +2238,7 @@
 #: sql_constraint:account.fiscal.position.tax:0
 msgid "A tax fiscal position could be defined only once time on same taxes."
 msgstr ""
+"Az adó adóügyi pozíciója csak egyszer határozható meg ugyanarra az adóra."
 
 #. module: account
 #: view:account.tax:0
@@ -2320,7 +2352,7 @@
 #: view:account.fiscalyear:0
 #: field:account.treasury.report,fiscalyear_id:0
 msgid "Fiscalyear"
-msgstr "Üzleti év"
+msgstr "Üzletiév"
 
 #. module: account
 #: code:addons/account/wizard/account_move_bank_reconcile.py:53
@@ -2963,6 +2995,22 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kattintson új adóügyi év létrehozásához.\n"
+"              </p><p>\n"
+"                Határozza meg a vállalkozása üzleti évét a kívánságainak "
+"megfelelően.\n"
+"                Egy üzleti év egy idő periódus, aminek a végén a vállalkozás "
+"könyvelése\n"
+"                elszámolásra kerül (általában 12 hónap). Az üzleti év arra a "
+"dátumra\n"
+"                hivatkozik általában ahol az véget ér. Például,\n"
+"                ha a vállalkozás pénzügyi üzleti éve 2011 november 30-ára "
+"esik, akkor\n"
+"                minden ami 2010 december 1 és 2011 november 30 közé esik\n"
+"                azt hívjuk 2011 évi üzleti/pénzügyi/adóügyi évnek.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: view:account.common.report:0
@@ -3912,6 +3960,8 @@
 "There is no fiscal year defined for this date.\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"Erre a dátumra nem lett üzleti adóügyi év meghatározva.\n"
+"Kérem hozzon létre egyet a könyvelési menü beállítása menüpont alatt."
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -4282,6 +4332,8 @@
 "The fiscalyear, periods or chart of account chosen have to belong to the "
 "same company."
 msgstr ""
+"Az üzelti adóügyi év, periódus vagy számlatükör kiválasztása ugyanarra a "
+"vállalkozásra kell, hogy vonatkozzon."
 
 #. module: account
 #: help:account.tax.code.template,notprintable:0
@@ -7050,6 +7102,14 @@
 msgstr "Tétel létrehozása"
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:account.open.closed.fiscalyear:0
+msgid "Cancel Fiscal Year Closing Entries"
+msgstr "Üzleti adóügyi év záró tételeinek eltörlése"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.account.type,report_type:0
 #: code:addons/account/account.py:189
 #, python-format
@@ -7344,6 +7404,8 @@
 "Error!\n"
 "The start date of a fiscal year must precede its end date."
 msgstr ""
+"Hiba!\n"
+"Az üzleti adóügyi év elejének előbb kell lennie mint a végének."
 
 #. module: account
 #: view:account.tax.template:0
@@ -8276,7 +8338,8 @@
 msgid ""
 "Select Fiscal Year which you want to remove entries for its End of year "
 "entries journal"
-msgstr "Válassza ki az üzleti évet, amelynek a nyitó tételeit törölni akarja"
+msgstr ""
+"Válassza ki az üzleti évet, amelynek a záró tételei közül törölni szeretne"
 
 #. module: account
 #: field:account.tax.template,type_tax_use:0
@@ -8397,7 +8460,7 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "No Fiscal Year Defined for This Company"
-msgstr ""
+msgstr "Ehhez a vállalkozáshoz nem lett üzleti adóügyi év meghatározva"
 
 #. module: account
 #: view:account.invoice:0
@@ -8548,6 +8611,9 @@
 "This wizard will remove the end of year journal entries of selected fiscal "
 "year. Note that you can run this wizard many times for the same fiscal year."
 msgstr ""
+"Ez a varázsló a kiválasztott üzleti adóügyi évet lezáró könyvelési napló "
+"tételeit fogja eltávolítani. Megjegyezzük, hogy ezt a varázslót többször is "
+"elindíthatja ugyanarra az üzleti évre."
 
 #. module: account
 #: report:account.invoice:0
@@ -8732,7 +8798,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_fiscalyear_close_state
 msgid "Fiscalyear Close state"
-msgstr "Üzleti év zárása"
+msgstr "Üzleti év zárt állapotban"
 
 #. module: account
 #: field:account.invoice.refund,journal_id:0
@@ -9161,7 +9227,7 @@
 #. module: account
 #: field:account.config.settings,has_fiscal_year:0
 msgid "Company has a fiscal year"
-msgstr ""
+msgstr "Vállalkozásnak van üzleti, adóügyi éve"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -9599,6 +9665,9 @@
 "The period is invalid. Either some periods are overlapping or the period's "
 "dates are not matching the scope of the fiscal year."
 msgstr ""
+"Hiba!\n"
+"Az időszak nem érvényes. Vagy az egyes időszakok átfedik egymást vagy az "
+"időszakok nem egyeznek az üzleti év határidőivel."
 
 #. module: account
 #: report:account.overdue:0
@@ -9897,7 +9966,7 @@
 #. module: account
 #: view:account.installer:0
 msgid "Configure your Fiscal Year"
-msgstr ""
+msgstr "Állítsa be az üzleti, adóügyi évét"
 
 #. module: account
 #: field:account.period,name:0
@@ -10834,6 +10903,8 @@
 msgid ""
 "The fiscal position will determine taxes and accounts used for the partner."
 msgstr ""
+"Az ÁFA pozíció meghatározza a partnerre vonatkozó adókat és főkönyvi "
+"számlákat."
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
@@ -10906,7 +10977,7 @@
 #: view:ir.sequence:0
 #: model:ir.ui.menu,name:account.menu_action_account_fiscalyear
 msgid "Fiscal Years"
-msgstr "Üzleti év"
+msgstr "Üzleti évek"
 
 #. module: account
 #: help:account.analytic.journal,active:0

=== modified file 'account/i18n/ja.po'
--- account/i18n/ja.po	2013-10-21 14:53:34 +0000
+++ account/i18n/ja.po	2013-11-12 13:23:09 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-07-06 02:41+0000\n"
 "Last-Translator: Akira Hiyama <Unknown>\n"
+=======
+"POT-Creation-Date: 2013-06-14 22:29+0000\n"
+"PO-Revision-Date: 2013-11-11 16:29+0000\n"
+"Last-Translator: Yoshi Tashiro <yostashiro@xxxxxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Japanese <ja@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-09-12 05:28+0000\n"
 "X-Generator: Launchpad (build 16761)\n"
+=======
+"X-Launchpad-Export-Date: 2013-11-12 06:22+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -45,7 +56,7 @@
 #: view:account.bank.statement:0
 #: view:account.move.line:0
 msgid "Account Statistics"
-msgstr "アカウントの統計情報"
+msgstr "勘定統計"
 
 #. module: account
 #: view:account.invoice:0
@@ -103,7 +114,7 @@
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:30
 #, python-format
 msgid "Reconcile"
-msgstr "消し込み"
+msgstr "消込"
 
 #. module: account
 #: field:account.bank.statement,name:0
@@ -166,7 +177,7 @@
 #: field:account.fiscal.position.account,account_src_id:0
 #: field:account.fiscal.position.account.template,account_src_id:0
 msgid "Account Source"
-msgstr "元アカウント"
+msgstr "元勘定"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_period
@@ -200,7 +211,7 @@
 #. module: account
 #: help:account.config.settings,code_digits:0
 msgid "No. of digits to use for account code"
-msgstr ""
+msgstr "勘定コードで使用する桁数"
 
 #. module: account
 #: help:account.analytic.journal,type:0
@@ -224,7 +235,7 @@
 #: model:ir.actions.act_window,name:account.action_account_tax_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_template_form
 msgid "Tax Templates"
-msgstr "税金テンプレート"
+msgstr "税テンプレート"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_line_reconcile_select
@@ -264,7 +275,7 @@
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_next:0
 msgid "Next credit note number"
-msgstr ""
+msgstr "次のクレジットノート番号"
 
 #. module: account
 #: help:account.config.settings,module_account_voucher:0
@@ -315,7 +326,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_unreconcile
 msgid "Account Unreconcile"
-msgstr "消し込みなしアカウント"
+msgstr ""
 
 #. module: account
 #: field:account.config.settings,module_account_budget:0
@@ -366,7 +377,7 @@
 #. module: account
 #: help:account.config.settings,group_analytic_accounting:0
 msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "分析会計を使用。"
 
 #. module: account
 #: view:account.invoice:0
@@ -481,7 +492,7 @@
 #. module: account
 #: view:account.journal:0
 msgid "Available Coins"
-msgstr ""
+msgstr "利用可能な硬貨"
 
 #. module: account
 #: field:accounting.report,enable_filter:0
@@ -539,7 +550,7 @@
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
-msgstr "この仕訳帳で使用されるアカウント"
+msgstr "この仕訳帳で使用される勘定"
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -572,7 +583,7 @@
 #. module: account
 #: field:account.automatic.reconcile,unreconciled:0
 msgid "Not reconciled transactions"
-msgstr "未消し込み取引"
+msgstr "未消込トランザクション"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -585,7 +596,7 @@
 #: field:account.fiscal.position,tax_ids:0
 #: field:account.fiscal.position.template,tax_ids:0
 msgid "Tax Mapping"
-msgstr "税金のマッピング"
+msgstr "税マッピング"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close_state
@@ -639,7 +650,7 @@
 #: view:account.fiscal.position:0
 #: view:account.fiscal.position.template:0
 msgid "Taxes Mapping"
-msgstr "税金マッピング"
+msgstr "税マッピング"
 
 #. module: account
 #: report:account.central.journal:0
@@ -661,7 +672,7 @@
 #. module: account
 #: field:account.journal,profit_account_id:0
 msgid "Profit Account"
-msgstr ""
+msgstr "収益勘定"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1156
@@ -672,7 +683,7 @@
 #. module: account
 #: model:ir.model,name:account.model_report_account_type_sales
 msgid "Report of the Sales by Account Type"
-msgstr "アカウントタイプ別売上レポート"
+msgstr "勘定タイプ別売上レポート"
 
 #. module: account
 #: code:addons/account/account.py:3201
@@ -702,12 +713,12 @@
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr "アカウント共有パートナレポート"
+msgstr "勘定共通取引先レポート"
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
 msgid "Opening Entries Period"
-msgstr "開始エントリーの期間"
+msgstr "期初仕訳期間"
 
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
@@ -766,7 +777,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Re-Open"
-msgstr "再度開く"
+msgstr "再開"
 
 #. module: account
 #: view:account.use.model:0
@@ -793,6 +804,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:account.account:0
+msgid "Account code"
+msgstr "勘定コード"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
 msgstr "階層とともに子を表示"
@@ -860,7 +879,7 @@
 #. module: account
 #: help:account.invoice,reference:0
 msgid "The partner reference of this invoice."
-msgstr "請求書のパートナ参照"
+msgstr "この請求書の取引先参照"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -871,7 +890,7 @@
 #: code:addons/account/account_move_line.py:851
 #, python-format
 msgid "Entry is already reconciled."
-msgstr ""
+msgstr "エントリは既に消込済みです。"
 
 #. module: account
 #: view:account.move.line.unreconcile.select:0
@@ -883,12 +902,12 @@
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
-msgstr "アカウント分析仕訳帳"
+msgstr "勘定分析仕訳帳"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Send by Email"
-msgstr ""
+msgstr "Eメールで送信"
 
 #. module: account
 #: help:account.central.journal,amount_currency:0
@@ -984,7 +1003,7 @@
 #. module: account
 #: field:account.config.settings,purchase_journal_id:0
 msgid "Purchase journal"
-msgstr ""
+msgstr "仕入仕訳帳"
 
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_paid
@@ -1112,7 +1131,7 @@
 #: model:ir.actions.report.xml,name:account.account_3rdparty_account_balance
 #: model:ir.ui.menu,name:account.menu_account_partner_balance_report
 msgid "Partner Balance"
-msgstr "パートナ残高"
+msgstr "取引先残高"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_gain_loss
@@ -1201,7 +1220,11 @@
 #. module: account
 #: field:account.config.settings,sale_refund_journal_id:0
 msgid "Sale refund journal"
+<<<<<<< TREE
 msgstr ""
+=======
+msgstr "売上返金仕訳帳"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_view_bank_statement_tree
@@ -1271,7 +1294,7 @@
 #: model:ir.actions.act_window,name:account.action_account_tax_code_template_form
 #: model:ir.ui.menu,name:account.menu_action_account_tax_code_template_form
 msgid "Tax Code Templates"
-msgstr "税金コードテンプレート"
+msgstr "税コードテンプレート"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -1283,7 +1306,7 @@
 #. module: account
 #: view:account.invoice.cancel:0
 msgid "Cancel Invoices"
-msgstr "請求書のキャンセル"
+msgstr "請求書取消"
 
 #. module: account
 #: help:account.journal,code:0
@@ -1293,7 +1316,7 @@
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Purchases"
-msgstr "仕入時にかかる税金"
+msgstr "購買で使用する税"
 
 #. module: account
 #: field:account.invoice.tax,tax_code_id:0
@@ -1302,7 +1325,7 @@
 #: field:account.tax.template,tax_code_id:0
 #: model:ir.model,name:account.model_account_tax_code
 msgid "Tax Code"
-msgstr "税金コード"
+msgstr "税コード"
 
 #. module: account
 #: field:account.account,currency_mode:0
@@ -1419,7 +1442,7 @@
 #: model:ir.ui.menu,name:account.menu_tax_report
 #: model:ir.ui.menu,name:account.next_id_27
 msgid "Taxes"
-msgstr "税金"
+msgstr "税"
 
 #. module: account
 #: code:addons/account/wizard/account_financial_report.py:70
@@ -1441,7 +1464,7 @@
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Search tax template"
-msgstr "税金テンプレート検索"
+msgstr "税テンプレート検索"
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -1454,7 +1477,7 @@
 #: model:ir.actions.report.xml,name:account.account_overdue
 #: view:res.company:0
 msgid "Overdue Payments"
-msgstr "期限超過の支払い"
+msgstr "滞納"
 
 #. module: account
 #: report:account.third_party_ledger:0
@@ -1486,12 +1509,12 @@
 #. module: account
 #: model:ir.model,name:account.model_account_entries_report
 msgid "Journal Items Analysis"
-msgstr "仕訳帳項目分析"
+msgstr "仕訳項目分析"
 
 #. module: account
 #: model:ir.ui.menu,name:account.next_id_22
 msgid "Partners"
-msgstr "パートナ"
+msgstr "取引先"
 
 #. module: account
 #: help:account.bank.statement,state:0
@@ -1518,7 +1541,7 @@
 #. module: account
 #: field:res.partner,property_account_receivable:0
 msgid "Account Receivable"
-msgstr "売掛金"
+msgstr "売掛金勘定"
 
 #. module: account
 #: code:addons/account/account.py:612
@@ -1536,7 +1559,7 @@
 #: selection:account.partner.balance,display_partner:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With balance is not equal to 0"
-msgstr "残高が0ではありません。"
+msgstr "残高があるもの(<>0)"
 
 #. module: account
 #: code:addons/account/account.py:1483
@@ -1549,7 +1572,7 @@
 #. module: account
 #: view:account.tax:0
 msgid "Search Taxes"
-msgstr "税金検索"
+msgstr "税検索"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_cost_ledger
@@ -1697,7 +1720,7 @@
 #. module: account
 #: view:account.move.line:0
 msgid "Unposted Journal Items"
-msgstr "未転記仕訳帳項目"
+msgstr "未転記仕訳項目"
 
 #. module: account
 #: view:account.chart.template:0
@@ -1709,7 +1732,7 @@
 #: field:account.tax,account_paid_id:0
 #: field:account.tax.template,account_paid_id:0
 msgid "Refund Tax Account"
-msgstr "返金税金アカウント"
+msgstr "返金税勘定"
 
 #. module: account
 #: model:ir.model,name:account.model_ir_sequence
@@ -1812,7 +1835,7 @@
 #: model:ir.actions.act_window,name:account.action_report_account_type_sales_tree_all
 #: view:report.account_type.sales:0
 msgid "Sales by Account Type"
-msgstr "アカウントタイプ別売上"
+msgstr "勘定タイプ別売上"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_15days
@@ -1876,7 +1899,7 @@
 #: report:account.journal.period.print.sale.purchase:0
 #: view:account.tax.template:0
 msgid "Tax Declaration"
-msgstr "税金申告"
+msgstr "税申告"
 
 #. module: account
 #: help:account.journal.period,active:0
@@ -1919,7 +1942,7 @@
 #. module: account
 #: selection:account.partner.balance,display_partner:0
 msgid "All Partners"
-msgstr "全パートナ"
+msgstr "全取引先"
 
 #. module: account
 #: view:account.analytic.chart:0
@@ -2147,7 +2170,11 @@
 #: view:account.analytic.account:0
 #: field:account.invoice.tax,account_analytic_id:0
 msgid "Analytic account"
+<<<<<<< TREE
 msgstr "分析アカウント"
+=======
+msgstr "分析勘定"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: code:addons/account/account_bank_statement.py:406
@@ -2200,7 +2227,7 @@
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:14
 #, python-format
 msgid "Journal :"
-msgstr ""
+msgstr "仕訳帳:"
 
 #. module: account
 #: sql_constraint:account.fiscal.position.tax:0
@@ -2211,7 +2238,7 @@
 #: view:account.tax:0
 #: view:account.tax.template:0
 msgid "Tax Definition"
-msgstr "税金の定義"
+msgstr "税定義"
 
 #. module: account
 #: view:account.config.settings:0
@@ -2255,7 +2282,7 @@
 #: code:addons/account/report/account_partner_ledger.py:274
 #, python-format
 msgid "Payable Accounts"
-msgstr "買掛金"
+msgstr "買掛金勘定"
 
 #. module: account
 #: constraint:account.move.line:0
@@ -2281,7 +2308,7 @@
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a sale journal."
-msgstr "売上仕訳帳に関連した分析仕訳帳項目"
+msgstr "売上仕訳帳に紐づく分析仕訳項目"
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -2453,7 +2480,7 @@
 #: field:product.category,property_account_income_categ:0
 #: field:product.template,property_account_income:0
 msgid "Income Account"
-msgstr "損益勘定"
+msgstr "収益勘定"
 
 #. module: account
 #: help:account.config.settings,default_sale_tax:0
@@ -2629,7 +2656,7 @@
 #. module: account
 #: view:product.category:0
 msgid "Account Properties"
-msgstr ""
+msgstr "勘定属性"
 
 #. module: account
 #: selection:account.invoice.refund,filter_refund:0
@@ -2639,7 +2666,7 @@
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
-msgstr "パートナ消し込み"
+msgstr "取引先消込"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -2650,7 +2677,7 @@
 #: field:account.tax,tax_code_id:0
 #: view:account.tax.code:0
 msgid "Account Tax Code"
-msgstr "税金コードアカウント"
+msgstr "勘定税コード"
 
 #. module: account
 #: model:account.payment.term,name:account.account_payment_term_advance
@@ -2721,7 +2748,7 @@
 #. module: account
 #: field:product.template,supplier_taxes_id:0
 msgid "Supplier Taxes"
-msgstr "仕入先税金"
+msgstr "仕入先税"
 
 #. module: account
 #: view:res.partner:0
@@ -2793,7 +2820,7 @@
 #: view:account.tax:0
 #: model:ir.model,name:account.model_account_tax
 msgid "Tax"
-msgstr "税金"
+msgstr "税"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -2805,7 +2832,7 @@
 #: field:account.move.line,analytic_account_id:0
 #: field:account.move.line.reconcile.writeoff,analytic_id:0
 msgid "Analytic Account"
-msgstr "分析アカウント"
+msgstr "分析勘定"
 
 #. module: account
 #: field:account.config.settings,default_purchase_tax:0
@@ -2928,7 +2955,7 @@
 #: field:account.tax,ref_base_code_id:0
 #: field:account.tax.template,ref_base_code_id:0
 msgid "Refund Base Code"
-msgstr "基本コードの返金"
+msgstr "返金基本コード"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_statement_tree
@@ -2973,14 +3000,14 @@
 #: field:account.tax,parent_id:0
 #: field:account.tax.template,parent_id:0
 msgid "Parent Tax Account"
-msgstr "親税金アカウント"
+msgstr "親税勘定"
 
 #. module: account
 #: view:account.aged.trial.balance:0
 #: model:ir.actions.act_window,name:account.action_account_aged_balance_view
 #: model:ir.ui.menu,name:account.menu_aged_trial_balance
 msgid "Aged Partner Balance"
-msgstr "パートナ残高年齢表"
+msgstr "取引先残高年齢表"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_entriesreconcile0
@@ -3086,7 +3113,7 @@
 #: model:ir.actions.act_window,name:account.action_tax_code_list
 #: model:ir.ui.menu,name:account.menu_action_tax_code_list
 msgid "Tax codes"
-msgstr "税金コード"
+msgstr "税コード"
 
 #. module: account
 #: view:account.account:0
@@ -3232,7 +3259,7 @@
 #. module: account
 #: field:account.partner.ledger,page_split:0
 msgid "One Partner Per Page"
-msgstr "ページ毎に1パートナ"
+msgstr "ページ毎に1取引先"
 
 #. module: account
 #: field:account.account,child_parent_ids:0
@@ -3297,7 +3324,7 @@
 #. module: account
 #: field:account.chart.template,tax_template_ids:0
 msgid "Tax Template List"
-msgstr "税金テンプレートリスト"
+msgstr "税テンプレートリスト"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_print_sale_purchase_journal
@@ -3331,7 +3358,7 @@
 #. module: account
 #: field:res.partner,property_supplier_payment_term:0
 msgid "Supplier Payment Term"
-msgstr ""
+msgstr "仕入先支払条件"
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3369,7 +3396,7 @@
 #. module: account
 #: help:account.invoice.tax,base_code_id:0
 msgid "The account basis of the tax declaration."
-msgstr "税金申告の会計基準"
+msgstr "税申告の会計基準"
 
 #. module: account
 #: selection:account.account,type:0
@@ -3404,7 +3431,7 @@
 #. module: account
 #: field:account.move.line,reconcile:0
 msgid "Reconcile Ref"
-msgstr ""
+msgstr "消込参照"
 
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
@@ -3414,12 +3441,12 @@
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
 msgid "Tax Code Template"
-msgstr "税金コードテンプレート"
+msgstr "税コードテンプレート"
 
 #. module: account
 #: model:ir.model,name:account.model_account_partner_ledger
 msgid "Account Partner Ledger"
-msgstr "アカウントパートナ元帳"
+msgstr "勘定取引先元帳"
 
 #. module: account
 #: model:email.template,body_html:account.email_template_edi_invoice
@@ -3603,7 +3630,7 @@
 #. module: account
 #: field:account.partner.reconcile.process,to_reconcile:0
 msgid "Remaining Partners"
-msgstr "存続パートナ"
+msgstr "存続取引先"
 
 #. module: account
 #: view:account.subscription:0
@@ -3664,7 +3691,7 @@
 #: code:addons/account/account_invoice.py:1465
 #, python-format
 msgid "No Partner Defined !"
-msgstr "パートナが定義されていません。"
+msgstr "取引先の定義がありません。"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_period_close
@@ -3907,12 +3934,12 @@
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
 msgid "Tax Code Amount"
-msgstr "税金コード金額"
+msgstr "税コード金額"
 
 #. module: account
 #: view:account.move.line:0
 msgid "Unreconciled Journal Items"
-msgstr "未消し込み仕訳帳項目"
+msgstr "未消込仕訳項目"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -3959,7 +3986,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_partner_reconcile_process
 msgid "Reconcilation Process partner by partner"
-msgstr "パートナ毎のパートナ消し込みプロセス"
+msgstr "取引先毎の消込プロセス"
 
 #. module: account
 #: view:account.chart:0
@@ -4036,6 +4063,7 @@
 "その上にパートナを定義して下さい。"
 
 #. module: account
+<<<<<<< TREE
 #: report:account.account.balance:0
 #: selection:account.balance.report,display_account:0
 #: selection:account.common.account.report,display_account:0
@@ -4045,6 +4073,11 @@
 #: selection:account.tax.template,type_tax_use:0
 msgid "All"
 msgstr "全て"
+=======
+#: view:account.tax:0
+msgid "Account Tax"
+msgstr "勘定税"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reporting_budgets
@@ -4130,7 +4163,7 @@
 #. module: account
 #: field:res.partner,property_account_payable:0
 msgid "Account Payable"
-msgstr "買掛金"
+msgstr "買掛金勘定"
 
 #. module: account
 #: code:addons/account/wizard/account_fiscalyear_close.py:88
@@ -4181,6 +4214,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Full Reconciliation Date"
+msgstr "前回完全消込日"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.account,name:0
 #: field:account.account.template,name:0
 #: report:account.analytic.account.inverted.balance:0
@@ -4190,7 +4231,7 @@
 #: field:account.move.reconcile,name:0
 #: field:account.subscription,name:0
 msgid "Name"
-msgstr "名前"
+msgstr "名称"
 
 #. module: account
 #: code:addons/account/installer.py:115
@@ -4343,7 +4384,7 @@
 #. module: account
 #: field:account.partner.balance,display_partner:0
 msgid "Display Partners"
-msgstr "パートナの表示"
+msgstr "取引先表示"
 
 #. module: account
 #: view:account.invoice:0
@@ -4375,7 +4416,7 @@
 #: field:account.common.account.report,display_account:0
 #: field:account.report.general.ledger,display_account:0
 msgid "Display Accounts"
-msgstr "アカウントの表示"
+msgstr "表示対象勘定"
 
 #. module: account
 #: view:account.state.open:0
@@ -4385,7 +4426,7 @@
 #. module: account
 #: field:account.tax,account_analytic_collected_id:0
 msgid "Invoice Tax Analytic Account"
-msgstr ""
+msgstr "請求書税分析勘定"
 
 #. module: account
 #: field:account.chart,period_from:0
@@ -4397,7 +4438,7 @@
 #: field:account.tax.template,name:0
 #: report:account.vat.declaration:0
 msgid "Tax Name"
-msgstr "税金名称"
+msgstr "税名称"
 
 #. module: account
 #: view:account.config.settings:0
@@ -4441,7 +4482,7 @@
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr "記帳済仕訳帳項目"
+msgstr "記帳済仕訳項目"
 
 #. module: account
 #: field:account.move.line,blocked:0
@@ -4451,7 +4492,7 @@
 #. module: account
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
-msgstr "税金テンプレート検索"
+msgstr "税テンプレート検索"
 
 #. module: account
 #: model:ir.ui.menu,name:account.periodical_processing_journal_entries_validation
@@ -4486,7 +4527,7 @@
 #: field:report.account.receivable,type:0
 #: field:report.account_type.sales,user_type:0
 msgid "Account Type"
-msgstr "アカウントタイプ"
+msgstr "勘定科目タイプ"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4587,7 +4628,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "Acc.Type"
-msgstr "アカウントタイプ"
+msgstr "勘定科目タイプ"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -4659,7 +4700,7 @@
 #: code:addons/account/report/common_report_header.py:68
 #, python-format
 msgid "All Posted Entries"
-msgstr "全ての記帳済エントリー"
+msgstr "全記帳済エントリ"
 
 #. module: account
 #: field:report.aged.receivable,name:0
@@ -4680,13 +4721,18 @@
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
 #, python-format
+<<<<<<< TREE
 msgid "Last Reconciliation:"
 msgstr ""
+=======
+msgid "End of Fiscal Year Entry"
+msgstr "会計年度締仕訳"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
-msgstr ""
+msgstr "貸借一致"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -4702,6 +4748,15 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:account.move:0
+#: view:account.move.line:0
+msgid "Add an internal note..."
+msgstr "内部注記を追加..."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
 msgstr ""
@@ -4803,7 +4858,7 @@
 #. module: account
 #: view:account.tax:0
 msgid "Tax Computation"
-msgstr ""
+msgstr "税計算"
 
 #. module: account
 #: view:wizard.multi.charts.accounts:0
@@ -4830,7 +4885,7 @@
 #: field:account.account,reconcile:0
 #: field:account.account.template,reconcile:0
 msgid "Allow Reconciliation"
-msgstr "消し込みの許可"
+msgstr "消込許可"
 
 #. module: account
 #: constraint:account.account:0
@@ -4900,7 +4955,7 @@
 #: selection:account.invoice.report,state:0
 #: selection:report.invoice.created,state:0
 msgid "Cancelled"
-msgstr "キャンセル済"
+msgstr "取消済"
 
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
@@ -4953,7 +5008,7 @@
 #. module: account
 #: report:account.invoice:0
 msgid "Cancelled Invoice"
-msgstr "キャンセル済請求書"
+msgstr "取消済請求書"
 
 #. module: account
 #: view:account.invoice:0
@@ -4971,10 +5026,18 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:account.move:0
+msgid "Cancel Entry"
+msgstr "記帳取消"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.tax,ref_tax_code_id:0
 #: field:account.tax.template,ref_tax_code_id:0
 msgid "Refund Tax Code"
-msgstr "税金コードの返金"
+msgstr "返金税コード"
 
 #. module: account
 #: view:account.invoice:0
@@ -4984,7 +5047,7 @@
 #. module: account
 #: field:account.chart.template,property_account_income:0
 msgid "Income Account on Product Template"
-msgstr "製品テンプレート上の損益勘定"
+msgstr "製品テンプレート上の収益勘定"
 
 #. module: account
 #: help:account.journal.period,state:0
@@ -5095,7 +5158,7 @@
 #. module: account
 #: field:account.partner.reconcile.process,today_reconciled:0
 msgid "Partners Reconciled Today"
-msgstr "本日パートナ消し込み済"
+msgstr "本日消込の取引先"
 
 #. module: account
 #: help:account.invoice.tax,tax_code_id:0
@@ -5117,7 +5180,7 @@
 #. module: account
 #: field:account.invoice,tax_line:0
 msgid "Tax Lines"
-msgstr "税金行"
+msgstr "税明細"
 
 #. module: account
 #: help:account.move.line,statement_id:0
@@ -5179,7 +5242,7 @@
 #: field:account.payment.term,active:0
 #: field:account.tax,active:0
 msgid "Active"
-msgstr "アクティブ"
+msgstr "有効"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5212,10 +5275,16 @@
 msgstr "アカウントのタイプ別残高"
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_cash_statement.py:301
 #, python-format
 msgid "There is no %s Account on the journal %s."
 msgstr ""
+=======
+#: view:account.fiscalyear.close:0
+msgid "Generate Fiscal Year Opening Entries"
+msgstr "会計年度期初仕訳の生成"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:res.groups,name:account.group_account_user
@@ -5242,7 +5311,7 @@
 #. module: account
 #: view:account.automatic.reconcile:0
 msgid "Close"
-msgstr "閉じる"
+msgstr "完了済"
 
 #. module: account
 #: field:account.bank.statement.line,move_ids:0
@@ -5285,12 +5354,12 @@
 #. module: account
 #: field:account.invoice.tax,name:0
 msgid "Tax Description"
-msgstr "税金説明"
+msgstr "税詳細"
 
 #. module: account
 #: field:account.tax,child_ids:0
 msgid "Child Tax Accounts"
-msgstr "子税金アカウント"
+msgstr "子税勘定"
 
 #. module: account
 #: help:account.tax,price_include:0
@@ -5333,7 +5402,7 @@
 #: field:account.vat.declaration,target_move:0
 #: field:accounting.report,target_move:0
 msgid "Target Moves"
-msgstr "ターゲットの移動"
+msgstr "対象仕訳"
 
 #. module: account
 #: code:addons/account/account.py:1454
@@ -5441,13 +5510,13 @@
 #: view:account.move.line:0
 #: field:account.partner.reconcile.process,next_partner_id:0
 msgid "Next Partner to Reconcile"
-msgstr "調整の次のパートナー"
+msgstr "次に消込する取引先"
 
 #. module: account
 #: field:account.invoice.tax,account_id:0
 #: field:account.move.line,tax_code_id:0
 msgid "Tax Account"
-msgstr "税金アカウント"
+msgstr "税勘定"
 
 #. module: account
 #: model:account.financial.report,name:account.account_financial_report_balancesheet0
@@ -5577,7 +5646,7 @@
 #. module: account
 #: field:account.journal,update_posted:0
 msgid "Allow Cancelling Entries"
-msgstr "エントリーのキャンセル許可"
+msgstr "エントリの取消許可"
 
 #. module: account
 #: code:addons/account/wizard/account_use_model.py:44
@@ -5598,7 +5667,7 @@
 #. module: account
 #: report:account.partner.balance:0
 msgid "(Account/Partner) Name"
-msgstr "アカウント / パートナ名"
+msgstr "(勘定/取引先)名称"
 
 #. module: account
 #: field:account.partner.reconcile.process,progress:0
@@ -5677,7 +5746,7 @@
 #. module: account
 #: model:account.account.type,name:account.account_type_asset_view1
 msgid "Asset View"
-msgstr ""
+msgstr "資産ビュー"
 
 #. module: account
 #: model:ir.model,name:account.model_account_common_account_report
@@ -5695,7 +5764,7 @@
 #: selection:account.period,state:0
 #: selection:report.invoice.created,state:0
 msgid "Open"
-msgstr "開く"
+msgstr "オープン"
 
 #. module: account
 #: view:account.config.settings:0
@@ -5715,12 +5784,12 @@
 #: field:account.partner.ledger,initial_balance:0
 #: field:account.report.general.ledger,initial_balance:0
 msgid "Include Initial Balances"
-msgstr "期首残高を含む"
+msgstr "期初残高を含む"
 
 #. module: account
 #: view:account.invoice.tax:0
 msgid "Tax Codes"
-msgstr "税金コード"
+msgstr "税コード"
 
 #. module: account
 #: selection:account.invoice,type:0
@@ -5820,7 +5889,7 @@
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_form
 #: model:ir.ui.menu,name:account.account_analytic_def_account
 msgid "Analytic Accounts"
-msgstr "分析アカウント"
+msgstr "分析勘定"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5916,7 +5985,7 @@
 #: field:account.print.journal,amount_currency:0
 #: field:account.report.general.ledger,amount_currency:0
 msgid "With Currency"
-msgstr "通貨で"
+msgstr "通貨表示"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -5959,13 +6028,13 @@
 #: view:account.move:0
 #: view:account.move.line:0
 msgid "Journal Item"
-msgstr "仕訳帳項目"
+msgstr "仕訳項目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear_close
 #: model:ir.ui.menu,name:account.menu_wizard_fy_close
 msgid "Generate Opening Entries"
-msgstr "開始エントリーの生成"
+msgstr "期初仕訳生成"
 
 #. module: account
 #: help:account.tax,type:0
@@ -6146,7 +6215,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "(update)"
-msgstr ""
+msgstr "(更新)"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -6192,7 +6261,7 @@
 #: field:account.tax,account_collected_id:0
 #: field:account.tax.template,account_collected_id:0
 msgid "Invoice Tax Account"
-msgstr "請求書税金アカウント"
+msgstr "請求書税勘定"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_general_journal
@@ -6320,7 +6389,7 @@
 #: view:res.company:0
 #: field:res.company,overdue_msg:0
 msgid "Overdue Payments Message"
-msgstr "支払延滞のメッセージ"
+msgstr "督促メッセージ"
 
 #. module: account
 #: field:account.entries.report,date_created:0
@@ -6372,7 +6441,7 @@
 #. module: account
 #: field:product.template,taxes_id:0
 msgid "Customer Taxes"
-msgstr "顧客の税金"
+msgstr "顧客税"
 
 #. module: account
 #: help:account.model,name:0
@@ -6407,7 +6476,7 @@
 #: field:account.tax,type:0
 #: field:account.tax.template,type:0
 msgid "Tax Type"
-msgstr "税金タイプ"
+msgstr "税タイプ"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_template_form
@@ -6430,7 +6499,7 @@
 #. module: account
 #: report:account.vat.declaration:0
 msgid "Tax Statement"
-msgstr "税金明細書"
+msgstr "税明細書"
 
 #. module: account
 #: model:ir.model,name:account.model_res_company
@@ -6481,7 +6550,7 @@
 #. module: account
 #: view:account.move.reconcile:0
 msgid "Partial Reconcile Entries"
-msgstr "部分消し込みエントリー"
+msgstr "部分消込エントリ"
 
 #. module: account
 #: view:account.aged.trial.balance:0
@@ -6520,7 +6589,7 @@
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Cancel"
-msgstr "キャンセル"
+msgstr "取消"
 
 #. module: account
 #: selection:account.account,type:0
@@ -6602,7 +6671,7 @@
 #. module: account
 #: selection:account.report.general.ledger,sortby:0
 msgid "Journal & Partner"
-msgstr "仕訳帳とパートナ"
+msgstr "仕訳帳・取引先"
 
 #. module: account
 #: field:account.automatic.reconcile,power:0
@@ -6641,7 +6710,7 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_partner_reconcile
 msgid "Reconciliation: Go to Next Partner"
-msgstr "消し込み:次のパートナへ"
+msgstr "消込:次の取引先へ"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_invert_balance
@@ -6715,7 +6784,7 @@
 #: model:ir.actions.act_window,name:account.action_account_analytic_journal_open_form
 #: model:ir.ui.menu,name:account.account_analytic_journal_entries
 msgid "Analytic Journal Items"
-msgstr "分析仕訳帳項目"
+msgstr "分析仕訳項目"
 
 #. module: account
 #: field:account.config.settings,has_default_company:0
@@ -6729,8 +6798,7 @@
 "year. Note that you can run this wizard many times for the same fiscal year: "
 "it will simply replace the old opening entries with the new ones."
 msgstr ""
-"このウィザードは選択した会計年度の年度仕訳帳項目の終わりを生成します。このウィザードは同じ会計年度で何度も実行できることに注意して下さい:これは単純に古い"
-"開始エントリーを新しいもので置き換えます。"
+"選択した新会計年度の期初仕訳を生成します。このウィザードは同じ会計年度で何度でも実行可能です(前回の実行で生成された期初仕訳が上書きされます)。"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_bank_and_cash
@@ -6957,7 +7025,7 @@
 #. module: account
 #: view:account.move.line:0
 msgid "Next Partner Entries to reconcile"
-msgstr "消し込みする次のパートナエントリー"
+msgstr "次に消込する取引先エントリ"
 
 #. module: account
 #: report:account.invoice:0
@@ -7044,7 +7112,7 @@
 #: model:ir.actions.report.xml,name:account.account_vat_declaration
 #: model:ir.ui.menu,name:account.menu_account_vat_declaration
 msgid "Taxes Report"
-msgstr "税金レポート"
+msgstr "税レポート"
 
 #. module: account
 #: selection:account.journal.period,state:0
@@ -7107,7 +7175,7 @@
 #: model:ir.ui.menu,name:account.menu_action_move_journal_line_form
 #: model:ir.ui.menu,name:account.menu_finance_entries
 msgid "Journal Entries"
-msgstr "仕訳帳エントリー"
+msgstr "仕訳"
 
 #. module: account
 #: code:addons/account/wizard/account_invoice_refund.py:147
@@ -7153,7 +7221,7 @@
 #: code:addons/account/report/common_report_header.py:67
 #, python-format
 msgid "All Entries"
-msgstr "全エントリー"
+msgstr "全エントリ"
 
 #. module: account
 #: constraint:account.move.reconcile:0
@@ -7300,7 +7368,7 @@
 #. module: account
 #: view:account.tax.template:0
 msgid "Taxes used in Sales"
-msgstr "売上で使われる税金"
+msgstr "販売で使用する税"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_invoice_tree1
@@ -7359,12 +7427,24 @@
 #: field:account.invoice.line,origin:0
 #: field:report.invoice.created,origin:0
 msgid "Source Document"
-msgstr "基となるドキュメント"
+msgstr "参照元"
 
 #. module: account
+<<<<<<< TREE
 #: help:account.config.settings,company_footer:0
 msgid "Bank accounts as printed in the footer of each printed document"
 msgstr ""
+=======
+#: code:addons/account/account_analytic_line.py:90
+#, python-format
+msgid "There is no expense account defined for this product: \"%s\" (id:%d)."
+msgstr ""
+
+#. module: account
+#: view:account.account.template:0
+msgid "Internal notes..."
+msgstr "内部注記..."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: constraint:account.account:0
@@ -7387,7 +7467,7 @@
 #. module: account
 #: report:account.invoice:0
 msgid "Taxes:"
-msgstr "税金:"
+msgstr "税:"
 
 #. module: account
 #: code:addons/account/account_invoice.py:458
@@ -7427,7 +7507,7 @@
 #. module: account
 #: view:account.tax.template:0
 msgid "Account Tax Template"
-msgstr "アカウント税金テンプレート"
+msgstr "勘定税テンプレート"
 
 #. module: account
 #: view:account.journal.select:0
@@ -7442,7 +7522,7 @@
 #. module: account
 #: field:account.chart.template,property_account_expense_opening:0
 msgid "Opening Entries Expense Account"
-msgstr "費用勘定の開始エントリー"
+msgstr "期初仕訳費用勘定"
 
 #. module: account
 #: view:account.invoice:0
@@ -7514,7 +7594,7 @@
 #. module: account
 #: view:account.move.line:0
 msgid "Unbalanced Journal Items"
-msgstr "不均衡状態の仕訳帳項目"
+msgstr "不均衡な仕訳項目"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_account_charts_modules
@@ -7534,7 +7614,7 @@
 #. module: account
 #: field:account.chart.template,tax_code_root_id:0
 msgid "Root Tax Code"
-msgstr "ルート税金コード"
+msgstr "基税コード"
 
 #. module: account
 #: help:account.journal,centralisation:0
@@ -7563,7 +7643,7 @@
 #. module: account
 #: field:account.chart.template,property_account_income_opening:0
 msgid "Opening Entries Income Account"
-msgstr "損益勘定の開始エントリー"
+msgstr "期初仕訳収益勘定"
 
 #. module: account
 #: field:account.config.settings,group_proforma_invoices:0
@@ -7592,7 +7672,7 @@
 #. module: account
 #: field:account.fiscalyear.close,report_name:0
 msgid "Name of new entries"
-msgstr "新エントリーの名前"
+msgstr "生成仕訳名称"
 
 #. module: account
 #: view:account.use.model:0
@@ -7625,7 +7705,7 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.action_analytic_open
 msgid "Contracts/Analytic Accounts"
-msgstr "契約 / 分析アカウント"
+msgstr "契約/分析勘定"
 
 #. module: account
 #: view:account.journal:0
@@ -7746,7 +7826,7 @@
 #: view:account.move.line:0
 #: selection:account.move.line,state:0
 msgid "Unbalanced"
-msgstr "アンバランス"
+msgstr "貸借不一致"
 
 #. module: account
 #: selection:account.move.line,centralisation:0
@@ -7805,7 +7885,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_tax
 msgid "Invoice Tax"
-msgstr "請求書税金"
+msgstr "請求書税"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1185
@@ -7835,7 +7915,7 @@
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr "未記帳の仕訳帳エントリー"
+msgstr "未記帳仕訳"
 
 #. module: account
 #: help:account.invoice.refund,date:0
@@ -7889,7 +7969,7 @@
 #: view:account.invoice.cancel:0
 #: model:ir.actions.act_window,name:account.action_account_invoice_cancel
 msgid "Cancel Selected Invoices"
-msgstr "選択請求書のキャンセル"
+msgstr "選択請求書を取消"
 
 #. module: account
 #: help:account.account.type,report_type:0
@@ -7941,7 +8021,7 @@
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "Post Journal Entries"
-msgstr "仕訳帳エントリーの記帳"
+msgstr "仕訳の記帳"
 
 #. module: account
 #: selection:account.bank.statement.line,type:0
@@ -8003,7 +8083,7 @@
 #. module: account
 #: selection:account.print.journal,sort_selection:0
 msgid "Journal Entry Number"
-msgstr "仕訳帳エントリー番号"
+msgstr "仕訳番号"
 
 #. module: account
 #: view:account.financial.report:0
@@ -8120,7 +8200,7 @@
 #: model:ir.actions.report.xml,name:account.account_3rdparty_ledger_other
 #: model:ir.ui.menu,name:account.menu_account_partner_ledger
 msgid "Partner Ledger"
-msgstr "パートナ元帳"
+msgstr "取引先元帳"
 
 #. module: account
 #: selection:account.tax.template,type:0
@@ -8191,7 +8271,7 @@
 #: model:ir.model,name:account.model_res_partner
 #: field:report.invoice.created,partner_id:0
 msgid "Partner"
-msgstr "パートナ"
+msgstr "取引先"
 
 #. module: account
 #: help:account.change.currency,currency_id:0
@@ -8240,7 +8320,7 @@
 #. module: account
 #: field:account.account.type,close_method:0
 msgid "Deferral Method"
-msgstr "繰延法"
+msgstr "繰越方法"
 
 #. module: account
 #: model:process.node,note:account.process_node_electronicfile0
@@ -8254,9 +8334,15 @@
 msgstr "このアカウントが仕訳帳項目の消し込みを許す場合は、このボックスをチェックして下さい。"
 
 #. module: account
+<<<<<<< TREE
 #: report:account.analytic.account.inverted.balance:0
 msgid "Inverted Analytic Balance -"
 msgstr "反転分析残高 -"
+=======
+#: selection:account.model.line,date_maturity:0
+msgid "Partner Payment Term"
+msgstr "取引先支払条件"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: help:account.move.reconcile,opening_reconciliation:0
@@ -8273,13 +8359,13 @@
 #. module: account
 #: view:account.analytic.account:0
 msgid "Associated Partner"
-msgstr "関連パートナ"
+msgstr "関連取引先"
 
 #. module: account
 #: code:addons/account/account_invoice.py:1465
 #, python-format
 msgid "You must first select a partner !"
-msgstr "最初にパートナを選択して下さい。"
+msgstr "始めに取引先を選択してください。"
 
 #. module: account
 #: field:account.invoice,comment:0
@@ -8322,7 +8408,7 @@
 #: field:account.subscription,state:0
 #: field:report.invoice.created,state:0
 msgid "Status"
-msgstr ""
+msgstr "ステータス"
 
 #. module: account
 #: report:account.analytic.account.cost_ledger:0
@@ -8541,13 +8627,13 @@
 msgid ""
 "You can check this box to mark this journal item as a litigation with the "
 "associated partner"
-msgstr "関連するパートナとの訴訟としてこの仕訳帳項目をマークするためには、このボックスをチェックします。"
+msgstr "仕訳項目が関連取引先と係争状態にあることを示すには、このボックスをチェックします。"
 
 #. module: account
 #: field:account.move.line,reconcile_partial_id:0
 #: view:account.move.line.reconcile:0
 msgid "Partial Reconcile"
-msgstr "部分消し込み"
+msgstr "部分消込"
 
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_inverted_balance
@@ -8596,7 +8682,7 @@
 #: model:ir.actions.act_window,name:account.action_account_type_form
 #: model:ir.ui.menu,name:account.menu_action_account_type_form
 msgid "Account Types"
-msgstr "アカウントタイプ"
+msgstr "勘定科目タイプ"
 
 #. module: account
 #: model:email.template,subject:account.email_template_edi_invoice
@@ -8676,7 +8762,7 @@
 #. module: account
 #: field:account.invoice.refund,journal_id:0
 msgid "Refund Journal"
-msgstr "仕訳帳の返金"
+msgstr "返金仕訳帳"
 
 #. module: account
 #: report:account.account.balance:0
@@ -8705,7 +8791,7 @@
 #. module: account
 #: help:account.invoice,account_id:0
 msgid "The partner account used for this invoice."
-msgstr "パートナアカウントはこの請求書に使用されています。"
+msgstr "この請求書に使われる取引先勘定"
 
 #. module: account
 #: code:addons/account/account.py:3391
@@ -8739,7 +8825,7 @@
 #. module: account
 #: view:account.vat.declaration:0
 msgid "Print Tax Statement"
-msgstr "税金明細書の印刷"
+msgstr "税明細書を印刷"
 
 #. module: account
 #: view:account.model.line:0
@@ -8764,7 +8850,7 @@
 #. module: account
 #: view:account.journal:0
 msgid "Accounts Type Allowed (empty for no control)"
-msgstr "許可アカウントタイプ(制御なしは空)"
+msgstr "許可勘定科目タイプ(制御なしは空)"
 
 #. module: account
 #: help:account.move.line,amount_residual:0
@@ -8851,7 +8937,7 @@
 #: model:ir.actions.act_window,name:account.action_account_analytic_chart
 #: model:ir.ui.menu,name:account.menu_action_analytic_account_tree2
 msgid "Chart of Analytic Accounts"
-msgstr "分析アカウントチャート"
+msgstr "分析勘定表"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_subscription_form
@@ -9023,7 +9109,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_partner_balance
 msgid "Print Account Partner Balance"
-msgstr "パートナ残高アカウントの印刷"
+msgstr "取引先別勘定残高を印刷"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1121
@@ -9065,7 +9151,7 @@
 #: code:addons/account/account.py:3198
 #, python-format
 msgid "Opening Entries Journal"
-msgstr "仕訳帳の開始エントリー"
+msgstr "期初仕訳帳"
 
 #. module: account
 #: model:process.transition,note:account.process_transition_customerinvoice0
@@ -9191,7 +9277,7 @@
 #. module: account
 #: field:account.config.settings,purchase_refund_journal_id:0
 msgid "Purchase refund journal"
-msgstr ""
+msgstr "仕入返金仕訳帳"
 
 #. module: account
 #: view:account.analytic.line:0
@@ -9292,7 +9378,7 @@
 #. module: account
 #: model:account.account.type,name:account.account_type_liability_view1
 msgid "Liability View"
-msgstr ""
+msgstr "負債ビュー"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9335,12 +9421,12 @@
 #. module: account
 #: field:res.partner,ref_companies:0
 msgid "Companies that refers to partner"
-msgstr "パートナに当てはまる会社"
+msgstr "取引先を参照する会社"
 
 #. module: account
 #: view:account.invoice:0
 msgid "Ask Refund"
-msgstr ""
+msgstr "返金要求"
 
 #. module: account
 #: view:account.move.line:0
@@ -9450,7 +9536,7 @@
 #: model:account.account.type,name:account.data_account_type_payable
 #: selection:account.entries.report,type:0
 msgid "Payable"
-msgstr "買掛金"
+msgstr "支払対象"
 
 #. module: account
 #: view:board.board:0
@@ -9607,7 +9693,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodic Processing"
-msgstr ""
+msgstr "定期処理"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -9676,7 +9762,7 @@
 #. module: account
 #: model:account.account.type,name:account.account_type_expense_view1
 msgid "Expense View"
-msgstr ""
+msgstr "費用ビュー"
 
 #. module: account
 #: field:account.move.line,date_maturity:0
@@ -9780,13 +9866,13 @@
 #: view:account.entries.report:0
 #: view:account.move.line:0
 msgid "Unreconciled"
-msgstr "未消し込み"
+msgstr "未消込"
 
 #. module: account
 #: code:addons/account/account_invoice.py:922
 #, python-format
 msgid "Bad total !"
-msgstr "合計が誤っています。"
+msgstr "合計が不正です。"
 
 #. module: account
 #: field:account.journal,sequence_id:0
@@ -9823,7 +9909,7 @@
 #: model:process.transition,name:account.process_transition_analyticinvoice0
 #: model:process.transition,name:account.process_transition_supplieranalyticcost0
 msgid "From analytic accounts"
-msgstr "分析アカウントから"
+msgstr "分析勘定より"
 
 #. module: account
 #: view:account.installer:0
@@ -9863,7 +9949,7 @@
 #: model:ir.model,name:account.model_account_move_line
 #: model:ir.ui.menu,name:account.menu_action_account_moves_all
 msgid "Journal Items"
-msgstr "仕訳帳項目"
+msgstr "仕訳項目"
 
 #. module: account
 #: view:accounting.report:0
@@ -9945,7 +10031,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Draft Invoice "
-msgstr ""
+msgstr "ドラフト請求書 "
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_general_journal
@@ -10248,7 +10334,7 @@
 #. module: account
 #: field:account.tax,account_analytic_paid_id:0
 msgid "Refund Tax Analytic Account"
-msgstr ""
+msgstr "返金税分析勘定"
 
 #. module: account
 #: view:account.move.bank.reconcile:0
@@ -10327,7 +10413,7 @@
 #: model:ir.actions.act_window,name:account.act_account_acount_move_line_open_unreconciled
 #, python-format
 msgid "Unreconciled Entries"
-msgstr "未消し込みエントリー"
+msgstr "未消込エントリ"
 
 #. module: account
 #: help:account.partner.reconcile.process,today_reconciled:0
@@ -10412,7 +10498,7 @@
 #. module: account
 #: view:account.partner.reconcile.process:0
 msgid "Go to Next Partner"
-msgstr "次のパートナへ"
+msgstr "次の取引先へ"
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -10521,7 +10607,7 @@
 #. module: account
 #: view:account.analytic.line:0
 msgid "Analytic Journal Items related to a purchase journal."
-msgstr "仕入仕訳帳に関連した分析仕訳帳項目"
+msgstr "仕入仕訳帳に紐づく分析仕訳項目"
 
 #. module: account
 #: help:account.account,type:0
@@ -10543,12 +10629,12 @@
 #: report:account.general.ledger_landscape:0
 #: selection:account.report.general.ledger,display_account:0
 msgid "With movements"
-msgstr "変動"
+msgstr "変動があったもの"
 
 #. module: account
 #: view:account.tax.code.template:0
 msgid "Account Tax Code Template"
-msgstr "アカウント税金コードテンプレート"
+msgstr "勘定税コードテンプレート"
 
 #. module: account
 #: model:process.node,name:account.process_node_manually0
@@ -10825,7 +10911,7 @@
 #. module: account
 #: field:account.account,note:0
 msgid "Internal Notes"
-msgstr ""
+msgstr "内部注記"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_fiscalyear
@@ -10901,7 +10987,7 @@
 #. module: account
 #: view:account.move.line:0
 msgid "Search Journal Items"
-msgstr "仕訳帳項目検索"
+msgstr "仕訳項目検索"
 
 #. module: account
 #: help:account.tax,base_sign:0
@@ -10928,7 +11014,7 @@
 #. module: account
 #: field:res.partner,property_payment_term:0
 msgid "Customer Payment Term"
-msgstr ""
+msgstr "顧客支払条件"
 
 #. module: account
 #: help:accounting.report,label_filter:0

=== modified file 'account/i18n/nl.po'
--- account/i18n/nl.po	2013-10-18 12:58:18 +0000
+++ account/i18n/nl.po	2013-11-12 13:23:09 +0000
@@ -4,21 +4,35 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 20:11+0000\n"
 "Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-14 22:29+0000\n"
+"PO-Revision-Date: 2013-11-08 13:57+0000\n"
+"Last-Translator: Jan Jurkus (GCE CAD-Service) <ict@xxxxxxxxxxxxxxxxx>\n"
+"Language-Team: Dutch <nl@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-09-12 05:24+0000\n"
 "X-Generator: Launchpad (build 16761)\n"
 
 #, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "Integriteitsfout !"
+=======
+"X-Launchpad-Export-Date: 2013-11-10 06:43+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -1265,7 +1279,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Refund "
-msgstr "Crediteer "
+msgstr "Credit factuur "
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:90
@@ -7452,7 +7466,7 @@
 "2%."
 msgstr ""
 "Het percentage voor de betalingsconditie regel moet liggen tussen 0 en 1, "
-"bijvoorbeeld 0,002 voor 2%."
+"bijvoorbeeld 0,02 voor 2%."
 
 #. module: account
 #: report:account.invoice:0
@@ -8341,7 +8355,7 @@
 #. module: account
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Refunds"
-msgstr "Klant en leverancier terugbetalingen"
+msgstr "Klant en leverancier credit facturen"
 
 #. module: account
 #: field:account.financial.report,sign:0
@@ -11586,7 +11600,7 @@
 #: code:addons/account/account_invoice.py:1159
 #, python-format
 msgid "Refund"
-msgstr "Crediteer"
+msgstr "Credit factuur"
 
 #. module: account
 #: model:ir.model,name:account.model_res_partner_bank

=== modified file 'account/i18n/sl.po'
--- account/i18n/sl.po	2013-09-12 06:40:18 +0000
+++ account/i18n/sl.po	2013-11-12 13:23:09 +0000
@@ -4,17 +4,31 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 23:02+0000\n"
 "Last-Translator: Dušan Laznik (Mentis) <laznik@xxxxxxxxx>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-14 22:29+0000\n"
+"PO-Revision-Date: 2013-11-06 14:13+0000\n"
+"Last-Translator: Darja Zorman <darja.zorman@xxxxxxxxx>\n"
+"Language-Team: Slovenian <sl@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-09-12 05:33+0000\n"
 "X-Generator: Launchpad (build 16761)\n"
+=======
+"X-Launchpad-Export-Date: 2013-11-07 05:50+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -51,7 +65,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma/Open/Paid Invoices"
-msgstr "Proforma/Odpri/Plačani računi"
+msgstr "Predračuni/Odprti računi/Plačani računi"
 
 #. module: account
 #: field:report.invoice.created,residual:0
@@ -238,7 +252,7 @@
 #. module: account
 #: model:process.transition,note:account.process_transition_supplierentriesreconcile0
 msgid "Accounting entries are an input of the reconciliation."
-msgstr "Postavke so vhod za usklajevanje"
+msgstr "Knjigovodske transakcije so osnova za uskaljevanje"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_management_belgian_reports
@@ -1042,7 +1056,7 @@
 #: model:account.financial.report,name:account.account_financial_report_liability0
 #: model:account.financial.report,name:account.account_financial_report_liabilitysum0
 msgid "Liability"
-msgstr "Odgovornost"
+msgstr "Obveznost"
 
 #. module: account
 #: code:addons/account/account_invoice.py:899

=== modified file 'account/i18n/sv.po'
--- account/i18n/sv.po	2013-09-12 06:40:18 +0000
+++ account/i18n/sv.po	2013-11-12 13:23:09 +0000
@@ -4,17 +4,31 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 5.0.14\n"
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-20 16:19+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-14 22:29+0000\n"
+"PO-Revision-Date: 2013-11-04 11:13+0000\n"
+"Last-Translator: Anders Eriksson, Mobila System <ae@xxxxxxxxxxxxxxx>\n"
+"Language-Team: Swedish <sv@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-09-12 05:33+0000\n"
 "X-Generator: Launchpad (build 16761)\n"
+=======
+"X-Launchpad-Export-Date: 2013-11-05 06:00+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -37,6 +51,14 @@
 "Generella rapporter / Skatter / Skattedeklaration'"
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:res.partner:0
+msgid "the parent company"
+msgstr "Moderföretaget"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.move.reconcile:0
 msgid "Journal Entry Reconcile"
 msgstr "Avstämning av verifikat"
@@ -80,7 +102,7 @@
 #: code:addons/account/account_move_line.py:1210
 #, python-format
 msgid "Bad Account!"
-msgstr ""
+msgstr "Fel konto!"
 
 #. module: account
 #: view:account.move:0
@@ -240,7 +262,7 @@
 #. module: account
 #: model:mail.message.subtype,name:account.mt_invoice_validated
 msgid "Validated"
-msgstr ""
+msgstr "Validerad"
 
 #. module: account
 #: model:account.account.type,name:account.account_type_income_view1
@@ -261,7 +283,7 @@
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_next:0
 msgid "Next credit note number"
-msgstr ""
+msgstr "Nästa kreditfakturanummer"
 
 #. module: account
 #: help:account.config.settings,module_account_voucher:0
@@ -365,7 +387,7 @@
 #. module: account
 #: help:account.config.settings,group_analytic_accounting:0
 msgid "Allows you to use the analytic accounting."
-msgstr ""
+msgstr "Tillåter dig att använda analys konteringen"
 
 #. module: account
 #: view:account.invoice:0
@@ -439,7 +461,7 @@
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
 #, python-format
 msgid "Period :"
-msgstr ""
+msgstr "Period:"
 
 #. module: account
 #: field:account.account.template,chart_template_id:0
@@ -796,6 +818,14 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:account.account:0
+msgid "Account code"
+msgstr "Kontokod"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.financial.report,display_detail:0
 msgid "Display children with hierarchy"
 msgstr "Visa barn i hierarkin"
@@ -911,7 +941,7 @@
 #. module: account
 #: view:account.account:0
 msgid "Account Code and Name"
-msgstr ""
+msgstr "Kontokod och namn"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -1098,7 +1128,7 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "Features"
-msgstr ""
+msgstr "Egenskaper"
 
 #. module: account
 #: code:addons/account/account.py:2346
@@ -1484,7 +1514,7 @@
 #. module: account
 #: field:account.fiscalyear.close.state,fy_id:0
 msgid "Fiscal Year to Close"
-msgstr ""
+msgstr "Bokföringsår som ska stängas"
 
 #. module: account
 #: field:account.config.settings,sale_sequence_prefix:0
@@ -1605,7 +1635,7 @@
 #: code:addons/account/wizard/account_report_common.py:164
 #, python-format
 msgid "Not implemented."
-msgstr ""
+msgstr "Ej implementerat"
 
 #. module: account
 #: view:account.invoice.refund:0
@@ -1798,7 +1828,7 @@
 #. module: account
 #: field:account.config.settings,group_analytic_accounting:0
 msgid "Analytic accounting"
-msgstr ""
+msgstr "Analyskonto"
 
 #. module: account
 #: report:account.overdue:0
@@ -1871,6 +1901,8 @@
 "Select a configuration package to setup automatically your\n"
 "                        taxes and chart of accounts."
 msgstr ""
+"Välj ett konfigureringspaket för att automatiskt skaap din\n"
+"                         kontoplan, skattekoder och momskoder."
 
 #. module: account
 #: view:account.analytic.account:0
@@ -1971,7 +2003,7 @@
 #. module: account
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
-msgstr ""
+msgstr "Betala dina leverantörer med check"
 
 #. module: account
 #: field:account.move.line.reconcile,credit:0
@@ -2126,7 +2158,7 @@
 #. module: account
 #: field:account.config.settings,currency_id:0
 msgid "Default company currency"
-msgstr ""
+msgstr "Företagets standardvaluta"
 
 #. module: account
 #: field:account.invoice,move_id:0

=== modified file 'account/i18n/zh_CN.po'
--- account/i18n/zh_CN.po	2013-11-10 05:54:20 +0000
+++ account/i18n/zh_CN.po	2013-11-12 13:23:09 +0000
@@ -4,17 +4,31 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2013-11-08 09:37+0000\n"
 "Last-Translator: jeffery chen fan <jeffery9@xxxxxxxxx>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-14 22:29+0000\n"
+"PO-Revision-Date: 2013-11-11 07:10+0000\n"
+"Last-Translator: jeffery chen fan <jeffery9@xxxxxxxxx>\n"
+"Language-Team: Chinese (Simplified) <zh_CN@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-11-10 05:54+0000\n"
 "X-Generator: Launchpad (build 16820)\n"
+=======
+"X-Launchpad-Export-Date: 2013-11-12 06:22+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -32,7 +46,16 @@
 msgid ""
 "Determine the display order in the report 'Accounting \\ Reporting \\ "
 "Generic Reporting \\ Taxes \\ Taxes Report'"
-msgstr "确定以下报告的显示顺序:”会计-报告-通用报告-税务-税务报告“"
+<<<<<<< TREE
+msgstr "确定以下报告的显示顺序:”会计-报告-通用报告-税务-税务报告“"
+=======
+msgstr "确定以下报告的显示顺序:”会计-报告-通用报告-税务-税务报告“"
+
+#. module: account
+#: view:res.partner:0
+msgid "the parent company"
+msgstr "父公司"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.move.reconcile:0
@@ -399,6 +422,14 @@
 msgstr "建立日期"
 
 #. module: account
+<<<<<<< TREE
+=======
+#: view:account.invoice:0
+msgid "Cancel Invoice"
+msgstr "取消传票"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
 msgstr "采购退款"
@@ -531,7 +562,11 @@
 #: model:ir.model,name:account.model_account_journal
 #: field:validate.account.move,journal_id:0
 msgid "Journal"
+<<<<<<< TREE
 msgstr "账簿"
+=======
+msgstr "凭证簿"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_confirm
@@ -551,7 +586,11 @@
 #. module: account
 #: field:account.bank.statement,account_id:0
 msgid "Account used in this journal"
+<<<<<<< TREE
 msgstr "使用在账簿里的科目"
+=======
+msgstr "使用在凭证簿里的科目"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: help:account.aged.trial.balance,chart_account_id:0
@@ -620,7 +659,11 @@
 #. module: account
 #: field:account.config.settings,decimal_precision:0
 msgid "Decimal precision on journal entries"
+<<<<<<< TREE
 msgstr "账簿分录小数精度"
+=======
+msgstr "凭证簿分录小数精度"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.config.settings,period:0
@@ -656,7 +699,7 @@
 #. module: account
 #: report:account.central.journal:0
 msgid "Centralized Journal"
-msgstr "汇总账簿"
+msgstr "汇总凭证簿"
 
 #. module: account
 #: sql_constraint:account.sequence.fiscalyear:0
@@ -726,13 +769,17 @@
 #. module: account
 #: model:ir.model,name:account.model_account_journal_period
 msgid "Journal Period"
-msgstr "账簿的会计期间"
+msgstr "凭证簿的会计期间"
 
 #. module: account
 #: constraint:account.move:0
 msgid ""
 "You cannot create more than one move per period on a centralized journal."
+<<<<<<< TREE
 msgstr "在每个会计期间,你不可以创建1个以上的总账簿"
+=======
+msgstr "在每个会计期间,你不可以创建1个以上的总凭证簿"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: help:account.tax,account_analytic_paid_id:0
@@ -770,7 +817,11 @@
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
 "change the date or remove this constraint from the journal."
+<<<<<<< TREE
 msgstr "账簿分录日期不在所选期间内!可以修改账簿分录日期或在账簿上去掉这个检查项。"
+=======
+msgstr "凭证簿分录日期不在所选期间内!可以修改账簿分录日期或在账簿上去掉这个检查项。"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.model,name:account.model_account_report_general_ledger
@@ -804,7 +855,16 @@
 msgid ""
 "Cannot %s invoice which is already reconciled, invoice should be "
 "unreconciled first. You can only refund this invoice."
-msgstr "不能 %s 已经对账的传票, 传票必须被首先反对账.。只能退还这张传票。"
+<<<<<<< TREE
+msgstr "不能 %s 已经对账的传票, 传票必须被首先反对账.。只能退还这张传票。"
+=======
+msgstr "不能 %s 已经对账的传票, 传票必须被首先反对账.。只能退还这张传票。"
+
+#. module: account
+#: view:account.account:0
+msgid "Account code"
+msgstr "科目代码"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.financial.report,display_detail:0
@@ -895,7 +955,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_analytic_journal_report
 msgid "Account Analytic Journal"
-msgstr "辅助核算账簿"
+msgstr "辅助核算凭证簿"
 
 #. module: account
 #: view:account.invoice:0
@@ -932,6 +992,16 @@
 msgstr "九月"
 
 #. module: account
+<<<<<<< TREE
+=======
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:24
+#, python-format
+msgid "Latest Manual Reconciliation Processed:"
+msgstr "最后的手工对账处理"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: selection:account.subscription,period_type:0
 msgid "days"
 msgstr "天"
@@ -951,7 +1021,7 @@
 "            "
 msgstr ""
 "<p>\n"
-"                    账簿明细未找到.\n"
+"                    凭证簿明细未找到.\n"
 "                </p>\n"
 "            "
 
@@ -1000,7 +1070,7 @@
 #. module: account
 #: field:account.config.settings,purchase_journal_id:0
 msgid "Purchase journal"
-msgstr "采购分类账"
+msgstr "采购凭证簿"
 
 #. module: account
 #: model:mail.message.subtype,description:account.mt_invoice_paid
@@ -1263,12 +1333,16 @@
 #. module: account
 #: model:process.transition,name:account.process_transition_confirmstatementfromdraft0
 msgid "Confirm statement"
+<<<<<<< TREE
 msgstr "确认报告"
 
 #. module: account
 #: view:account.tax:0
 msgid "Account Tax"
 msgstr "税"
+=======
+msgstr "确认报告"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: help:account.account,foreign_balance:0
@@ -1527,7 +1601,18 @@
 #. module: account
 #: field:account.invoice.report,state:0
 msgid "Invoice Status"
-msgstr "传票状态"
+<<<<<<< TREE
+msgstr "传票状态"
+=======
+msgstr "传票状态"
+
+#. module: account
+#: view:account.open.closed.fiscalyear:0
+#: model:ir.actions.act_window,name:account.action_account_open_closed_fiscalyear
+#: model:ir.ui.menu,name:account.menu_wizard_account_open_closed_fiscalyear
+msgid "Cancel Closing Entries"
+msgstr "取消已经结账的分录"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.bank.statement:0
@@ -1660,7 +1745,19 @@
 #: model:ir.actions.act_window,name:account.action_invoice_tree4
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree4
 msgid "Supplier Refunds"
-msgstr "供应商红字传票"
+<<<<<<< TREE
+msgstr "供应商红字传票"
+=======
+msgstr "供应商红字传票"
+
+#. module: account
+#: report:account.invoice:0
+#: view:account.invoice:0
+#: field:account.invoice,date_invoice:0
+#: field:report.invoice.created,date_invoice:0
+msgid "Invoice Date"
+msgstr "传票日期"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.tax.code,code:0
@@ -3088,9 +3185,17 @@
 msgstr "你不能删除已经登帐的账簿分录\"%s\"."
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice:0
 msgid "Accounting Period"
 msgstr "会计期间"
+=======
+#: help:account.tax,account_collected_id:0
+msgid ""
+"Set the account that will be set by default on invoice tax lines for "
+"invoices. Leave empty to use the expense account."
+msgstr "设置科目,用于退款时传票上默认税科目。留空使用费用科目。"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.config.settings,sale_journal_id:0
@@ -3963,12 +4068,16 @@
 #. module: account
 #: help:account.config.settings,default_purchase_tax:0
 msgid "This purchase tax will be assigned by default on new products."
+<<<<<<< TREE
 msgstr "该项购置税将默认分配到新产品"
 
 #. module: account
 #: report:account.invoice:0
 msgid "VAT :"
 msgstr "增值税 :"
+=======
+msgstr "该项购置税将默认分配到新产品"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: report:account.account.balance:0
@@ -4218,7 +4327,16 @@
 #. module: account
 #: field:account.config.settings,complete_tax_set:0
 msgid "Complete set of taxes"
-msgstr "完全税收套账"
+<<<<<<< TREE
+msgstr "完全税收套账"
+=======
+msgstr "完全税收套账"
+
+#. module: account
+#: field:res.partner,last_reconciliation_date:0
+msgid "Latest Full Reconciliation Date"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.account,name:0
@@ -4568,6 +4686,32 @@
 msgstr ""
 
 #. module: account
+<<<<<<< TREE
+=======
+#: model:ir.model,name:account.model_account_invoice_cancel
+msgid "Cancel the Selected Invoices"
+msgstr "取消选定的传票"
+
+#. module: account
+#: code:addons/account/account_bank_statement.py:424
+#, python-format
+msgid "You have to assign an analytic journal on the '%s' journal!"
+msgstr "必须分配一个辅助核算账簿给\"%s\"账簿"
+
+#. module: account
+#: model:process.transition,note:account.process_transition_supplieranalyticcost0
+msgid ""
+"Analytic costs (timesheets, some purchased products, ...) come from analytic "
+"accounts. These generate draft supplier invoices."
+msgstr "(时间表,一些采购产品,... ...)分析成本来辅助核算项。用来产生供应商传票草稿。"
+
+#. module: account
+#: view:account.bank.statement:0
+msgid "Close CashBox"
+msgstr "关闭出纳账"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: constraint:account.tax.code.template:0
 msgid ""
 "Error!\n"
@@ -4714,6 +4858,7 @@
 #. module: account
 #: field:account.move.reconcile,opening_reconciliation:0
 msgid "Opening Entries Reconciliation"
+<<<<<<< TREE
 msgstr "开放的对账条目"
 
 #. module: account
@@ -4722,6 +4867,9 @@
 #, python-format
 msgid "Last Reconciliation:"
 msgstr ""
+=======
+msgstr "开放的对账条目"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.move.line,state:0
@@ -5165,6 +5313,7 @@
 #. module: account
 #: model:process.transition,note:account.process_transition_suppliercustomerinvoice0
 msgid "Draft invoices are validated. "
+<<<<<<< TREE
 msgstr "传票草稿已生效。 "
 
 #. module: account
@@ -5173,6 +5322,9 @@
 "Set the account that will be set by default on invoice tax lines for "
 "invoices. Leave empty to use the expense account."
 msgstr "设置科目,用于退款时传票上默认税科目。留空使用费用科目。"
+=======
+msgstr "传票草稿已生效。 "
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: code:addons/account/account.py:890
@@ -8095,7 +8247,19 @@
 #. module: account
 #: view:account.move.line.reconcile:0
 msgid "Reconciliation Transactions"
-msgstr "对账交易"
+<<<<<<< TREE
+msgstr "对账交易"
+=======
+msgstr "对账交易"
+
+#. module: account
+#: code:addons/account/account_invoice.py:472
+#, python-format
+msgid ""
+"You cannot delete an invoice which is not draft or cancelled. You should "
+"refund it instead."
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_legal_statement
@@ -9768,14 +9932,35 @@
 msgid ""
 "It indicates that the invoice has been paid and the journal entry of the "
 "invoice has been reconciled with one or several journal entries of payment."
-msgstr "此字段表示传票已付款,也就是说这张传票对应的会计凭证与一张或几张付款对应的会计凭证已对账。"
+<<<<<<< TREE
+msgstr "此字段表示传票已付款,也就是说这张传票对应的会计凭证与一张或几张付款对应的会计凭证已对账。"
+=======
+msgstr "此字段表示传票已付款,也就是说这张传票对应的会计凭证与一张或几张付款对应的会计凭证已对账。"
+
+#. module: account
+#: code:addons/account/account_move_line.py:780
+#, python-format
+msgid "Journal Item '%s' (id: %s), Move '%s' is already reconciled!"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.invoice:0
 #: view:account.invoice.report:0
 #: model:process.node,name:account.process_node_supplierdraftinvoices0
 msgid "Draft Invoices"
-msgstr "传票草稿"
+<<<<<<< TREE
+msgstr "传票草稿"
+=======
+msgstr "传票草稿"
+
+#. module: account
+#. openerp-web
+#: code:addons/account/static/src/xml/account_move_reconciliation.xml:31
+#, python-format
+msgid "Nothing more to reconcile"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:cash.box.in:0
@@ -10954,6 +11139,7 @@
 "in its currency (maybe different of the company currency)."
 msgstr "基于当前币别的应收或应付款的余额"
 
+<<<<<<< TREE
 #, python-format
 #~ msgid "Integrity Error !"
 #~ msgstr "完整性错误!"
@@ -14675,3 +14861,23 @@
 
 #~ msgid "Cancel Invoice"
 #~ msgstr "取消传票"
+=======
+#~ msgid "VAT :"
+#~ msgstr "增值税 :"
+
+#~ msgid "Cancel Opening Entries"
+#~ msgstr "取消开账分录"
+
+#~ msgid "Current"
+#~ msgstr "当前的"
+
+#~ msgid "Cancel Fiscal Year Opening Entries"
+#~ msgstr "取消财务年度未结案分录"
+
+#~ msgid "Latest Reconciliation Date"
+#~ msgstr "最近的对账日期"
+
+#, python-format
+#~ msgid "Nothing to reconcile"
+#~ msgstr "没有什么被对账"
+>>>>>>> MERGE-SOURCE

=== modified file 'account/partner.py'
--- account/partner.py	2013-10-18 12:58:18 +0000
+++ account/partner.py	2013-11-12 13:23:09 +0000
@@ -107,14 +107,15 @@
     _description = 'Partner'
 
     def _credit_debit_get(self, cr, uid, ids, field_names, arg, context=None):
-        query = self.pool.get('account.move.line')._query_get(cr, uid, context=context)
+        ctx = context.copy()
+        ctx['all_fiscalyear'] = True
+        query = self.pool.get('account.move.line')._query_get(cr, uid, context=ctx)
         cr.execute("""SELECT l.partner_id, a.type, SUM(l.debit-l.credit)
                       FROM account_move_line l
                       LEFT JOIN account_account a ON (l.account_id=a.id)
                       WHERE a.type IN ('receivable','payable')
                       AND l.partner_id IN %s
-                      AND (l.reconcile_id IS NULL OR 
-                           reconcile_id in (SELECT id FROM account_move_reconcile WHERE opening_reconciliation is TRUE))
+                      AND l.reconcile_id IS NULL
                       AND """ + query + """
                       GROUP BY l.partner_id, a.type
                       """,

=== modified file 'account_accountant/i18n/fi.po'
--- account_accountant/i18n/fi.po	2013-09-12 06:40:18 +0000
+++ account_accountant/i18n/fi.po	2013-11-12 13:23:09 +0000
@@ -7,20 +7,35 @@
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-06-22 05:51+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+=======
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2013-10-31 20:46+0000\n"
+"Last-Translator: Harri Luuppala <Unknown>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Finnish <fi@xxxxxx>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-09-12 06:27+0000\n"
 "X-Generator: Launchpad (build 16761)\n"
+=======
+"X-Launchpad-Export-Date: 2013-11-01 06:27+0000\n"
+"X-Generator: Launchpad (build 16820)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_accountant
 #: model:ir.actions.client,name:account_accountant.action_client_account_menu
 msgid "Open Accounting Menu"
+<<<<<<< TREE
 msgstr ""
 
 #~ msgid "Accountant"
 #~ msgstr "Kirjanpitäjä"
+=======
+msgstr "Avaa kirjanpitovalikko"
+>>>>>>> MERGE-SOURCE

=== modified file 'account_analytic_analysis/i18n/bs.po'
--- account_analytic_analysis/i18n/bs.po	2013-09-12 06:40:18 +0000
+++ account_analytic_analysis/i18n/bs.po	2013-11-12 13:23:09 +0000
@@ -4,40 +4,72 @@
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@xxxxxxxxxxx\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-05-08 08:39+0000\n"
 "Last-Translator: Bojan Markovic <Unknown>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2013-06-07 19:36+0000\n"
+"PO-Revision-Date: 2013-10-27 22:27+0000\n"
+"Last-Translator: Bosko Stojakovic <bluesoft83@xxxxxxxxx>\n"
+"Language-Team: Bosnian <bs@xxxxxx>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2013-09-12 05:46+0000\n"
 "X-Generator: Launchpad (build 16761)\n"
+=======
+"X-Launchpad-Export-Date: 2013-10-28 05:42+0000\n"
+"X-Generator: Launchpad (build 16810)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "No order to invoice, create"
-msgstr ""
-
-#. module: account_analytic_analysis
+msgstr "Nema narudžbe za fakturisanje, kreiraj"
+
+#. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: code:addons/account_analytic_analysis/account_analytic_analysis.py:547
+#, python-format
+msgid "Timesheets to Invoice of %s"
+msgstr "Vremenski listovi za fakturisanje od %s"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
 #: view:account.analytic.account:0
 msgid "Group By..."
 msgstr "Grupiraj po..."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
+<<<<<<< TREE
+=======
+msgid "Template"
+msgstr "Predložak"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+>>>>>>> MERGE-SOURCE
 msgid "To Invoice"
-msgstr ""
+msgstr "Za fakturisanje"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Remaining"
-msgstr ""
+msgstr "Preostalo"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
+<<<<<<< TREE
 msgid "Contracts in progress"
 msgstr ""
 
@@ -49,6 +81,10 @@
 msgstr ""
 "Ako fakturirate iz troškova, ovo je krajnji datum rada ili troška koji je "
 "bio fakturiran."
+=======
+msgid "End date passed or prepaid unit consumed"
+msgstr "Prekoračen završni datum ili potrošena pretplata"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,last_worked_date:0
@@ -73,7 +109,7 @@
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "⇒ Invoice"
-msgstr ""
+msgstr "⇒ Faktura"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_invoiced:0
@@ -88,28 +124,79 @@
 #. module: account_analytic_analysis
 #: help:account.analytic.account,fix_price_to_invoice:0
 msgid "Sum of quotations for this contract."
+msgstr "Suma ponuda za ovaj ugovor"
+
+#. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: model:ir.actions.act_window,help:account_analytic_analysis.action_sales_order
+msgid ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a quotation that can be converted into a "
+"sales\n"
+"                order.\n"
+"              </p><p>\n"
+"                Use sale orders to track everything that should be invoiced\n"
+"                at a fix price on a contract.\n"
+"              </p>\n"
+"            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite za izradu predračuna koji se može konvertovati u "
+"prodajnu\n"
+"                narudžbu.\n"
+"              </p><p>\n"
+"                Koristite prodajne narudžbe za praćenje svega što treba biti "
+"fakturisano\n"
+"                po fiksnoj cijeni na ugovoru.\n"
+"              </p>\n"
+"            "
 
 #. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
 #: help:account.analytic.account,ca_invoiced:0
 msgid "Total customer invoiced amount for this account."
 msgstr "Ukupni iznos izlaznih Faktura za ovaj konto kupca."
 
 #. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
 #: help:account.analytic.account,timesheet_ca_invoiced:0
 msgid "Sum of timesheet lines invoiced for this contract."
-msgstr ""
-
-#. module: account_analytic_analysis
+msgstr "Suma stavki vremenskih listova fakturisanih za ovaj ugovor."
+
+#. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: model:email.template,subject:account_analytic_analysis.account_analytic_cron_email_template
+msgid "Contract expiration reminder ${user.company_id.name}"
+msgstr "Podsjetnik za istek ugovora ${user.company_id.name}"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
 #: code:addons/account_analytic_analysis/account_analytic_analysis.py:464
 #, python-format
 msgid "Sales Order Lines of %s"
-msgstr ""
-
-#. module: account_analytic_analysis
+msgstr "Stavke prodajne narudžbe od %s"
+
+#. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "End date is in the next month"
+msgstr "Datum završetka je u sljedećem mjesecu"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
 #: help:account.analytic.account,revenue_per_hour:0
 msgid "Computed using the formula: Invoiced Amount / Total Time"
-msgstr ""
+msgstr "Izračunato korištenjem formule: fakturisani iznos / ukupno vrijeme"
 
 #. module: account_analytic_analysis
 #: field:account_analytic_analysis.summary.month,account_id:0
@@ -121,12 +208,12 @@
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Partner"
-msgstr ""
+msgstr "Partner"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contracts that are not assigned to an account manager."
-msgstr ""
+msgstr "Ugovori koji nisu pridruženi manadžeru klijenta"
 
 #. module: account_analytic_analysis
 #: model:ir.actions.act_window,help:account_analytic_analysis.action_account_analytic_overdue
@@ -146,6 +233,18 @@
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Kliknite za definiranje novog ugovora.\n"
+"              </p><p>\n"
+"                Ovdje se nalaze ugovori koje bi trebalo obnoviti\n"
+"                jer je prošao datum završetka.\n"
+"              </p><p>\n"
+"                OpenERP automatski postavlja ugovore koji se trebaju "
+"obnaviti u status 'na čekanju'. \n"
+"                Nakon pregovora, prodavač bi trebao zatvoriti ili obnoviti "
+"ugovore na čekanju.. \n"
+"              </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -155,32 +254,37 @@
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Account Manager"
-msgstr ""
+msgstr "Manager zadužen za klijenta"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours_to_invoice:0
 msgid "Computed using the formula: Maximum Time - Total Invoiced Time"
-msgstr ""
+msgstr "Izračunato kao: maksimalno vrijeme - ukupno fakturisano vrijeme"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Expected"
-msgstr ""
+msgstr "Očekivano"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
+<<<<<<< TREE
 msgid "Contracts not assigned"
 msgstr ""
+=======
+msgid "Closed contracts"
+msgstr "Zatvoreni ugovori"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,theorical_margin:0
 msgid "Computed using the formula: Theoretical Revenue - Total Costs"
-msgstr ""
+msgstr "Izračunato kao: Teoretski prihod - ukupni trošak"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_qtt_invoiced:0
 msgid "Invoiced Time"
-msgstr ""
+msgstr "Fakturisano vrijeme"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,fix_price_to_invoice:0
@@ -188,7 +292,7 @@
 #: field:account.analytic.account,remaining_hours_to_invoice:0
 #: field:account.analytic.account,timesheet_ca_invoiced:0
 msgid "Remaining Time"
-msgstr ""
+msgstr "Preostalo vrijeme"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -198,36 +302,42 @@
 msgstr ""
 
 #. module: account_analytic_analysis
+<<<<<<< TREE
 #: field:account.analytic.account,real_margin_rate:0
 msgid "Real Margin Rate (%)"
 msgstr "Realna stopa marže (%)"
+=======
+#: view:account.analytic.account:0
+msgid "Pricelist"
+msgstr "Cjenovnik"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,remaining_hours:0
 msgid "Computed using the formula: Maximum Time - Total Worked Time"
-msgstr ""
+msgstr "Izračunato kao: maksimalno vrijeme - ukupno odrađeno vrijeme"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_quantity:0
 msgid ""
 "Number of time you spent on the analytic account (from timesheet). It "
 "computes quantities on all journal of type 'general'."
-msgstr ""
+msgstr "Vrijeme provedeno na analitičkom računu (iz evidencije rada)."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Nothing to invoice, create"
-msgstr ""
+msgstr "Ništa za fakturisanje, kreiraj"
 
 #. module: account_analytic_analysis
 #: model:res.groups,name:account_analytic_analysis.group_template_required
 msgid "Mandatory use of templates in contracts"
-msgstr ""
+msgstr "Obvezno korištenje predložaka u ugovorima"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,hours_quantity:0
 msgid "Total Worked Time"
-msgstr ""
+msgstr "Ukupno odrađeno vrijeme"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,real_margin:0
@@ -235,11 +345,34 @@
 msgstr "Stvarna granica"
 
 #. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid ""
+"{'required': [('type','=','contract'),'|',('fix_price_invoices','=',True), "
+"('invoice_on_timesheets', '=', True)]}"
+msgstr ""
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+msgid "Contracts assigned to a customer."
+msgstr "Ugovori dodijeljeni kupcu"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_month
 msgid "Hours summary by month"
 msgstr "Ukupno sati po mjesecu"
 
 #. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "Pending contracts"
+msgstr "Ugovori na čekanju"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
 #: help:account.analytic.account,real_margin_rate:0
 msgid "Computes using the formula: (Real Margin / Total Costs) * 100."
 msgstr ""
@@ -248,7 +381,7 @@
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "or view"
-msgstr ""
+msgstr "ili pogledaj"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -258,9 +391,17 @@
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Parent"
-msgstr ""
-
-#. module: account_analytic_analysis
+msgstr "Roditelj"
+
+#. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "Units Consumed"
+msgstr "Jedinica potrošeno"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
 #: field:account.analytic.account,month_ids:0
 #: field:account_analytic_analysis.summary.month,month:0
 msgid "Month"
@@ -270,7 +411,7 @@
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_hr_tree_invoiced_all
 #: model:ir.ui.menu,name:account_analytic_analysis.menu_action_hr_tree_invoiced_all
 msgid "Time & Materials to Invoice"
-msgstr ""
+msgstr "Vrijeme i Materijali za fakturisanje"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -282,12 +423,20 @@
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Start Date"
-msgstr ""
-
-#. module: account_analytic_analysis
-#: view:account.analytic.account:0
+msgstr "Datum početka"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+<<<<<<< TREE
+=======
+msgid "Expiring soon"
+msgstr "Uskoro ističe"
+
+#. module: account_analytic_analysis
+#: view:account.analytic.account:0
+>>>>>>> MERGE-SOURCE
 msgid "Invoiced"
-msgstr ""
+msgstr "Fakturisano"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -304,14 +453,24 @@
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Timesheets"
-msgstr ""
-
-#. module: account_analytic_analysis
+msgstr "Vremenski listovi"
+
+#. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "Closed"
+msgstr "Zatvoreno"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
 #: help:account.analytic.account,hours_qtt_non_invoiced:0
 msgid ""
 "Number of time (hours/days) (from journal of type 'general') that can be "
 "invoiced if you invoice based on analytic account."
 msgstr ""
+"Vrijeme (sati / dani) (iz dnevnika tipa 'opšte') koje se može fakturisati "
+"ako se fakturiše na osnovu analitičkog konta."
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
@@ -321,12 +480,12 @@
 #. module: account_analytic_analysis
 #: field:account.analytic.account,is_overdue_quantity:0
 msgid "Overdue Quantity"
-msgstr ""
+msgstr "Zakašnjela količina"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #. module: account_analytic_analysis
 #: field:account.analytic.account,ca_theorical:0
@@ -340,20 +499,27 @@
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
+<<<<<<< TREE
 msgid ""
 "A contract in OpenERP is an analytic account having a partner set on it."
 msgstr ""
+=======
+#: model:ir.actions.act_window,name:account_analytic_analysis.action_account_analytic_overdue_all
+#: model:ir.ui.menu,name:account_analytic_analysis.menu_action_account_analytic_overdue_all
+msgid "Contracts"
+msgstr "Ugovori"
+>>>>>>> MERGE-SOURCE
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 #: model:ir.actions.act_window,name:account_analytic_analysis.action_sales_order
 msgid "Sales Orders"
-msgstr ""
+msgstr "Prodajne narudžbe"
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,last_invoice_date:0
 msgid "If invoice from the costs, this is the date of the latest invoiced."
-msgstr ""
+msgstr "Ako je fakturisano iz troškova, ovo je datum zadnje fakturisanog."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,ca_theorical:0
@@ -372,6 +538,14 @@
 msgstr "Korisnik"
 
 #. module: account_analytic_analysis
+<<<<<<< TREE
+=======
+#: view:account.analytic.account:0
+msgid "Cancelled contracts"
+msgstr "Otkazani ugovori"
+
+#. module: account_analytic_analysis
+>>>>>>> MERGE-SOURCE
 #: model:ir.actions.act_window,help:account_analytic_analysis.template_of_contract_action
 msgid ""
 "<p class=\"oe_view_nocontent_create\">\n"
@@ -384,16 +558,25 @@
 "                </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                    Kliknite ovdje da biste stvorili predložak ugovora.\n"
+"                </p><p>\n"
+"                    Predlošci se koriste kako bi unaprijed postavili ugovor "
+"/ projekt koji\n"
+"                    prodavač može odabrati da bi brzo podesio \n"
+"                    uslove ugovora.\n"
+"                </p>\n"
+"            "
 
 #. module: account_analytic_analysis
 #: model:ir.model,name:account_analytic_analysis.model_account_analytic_analysis_summary_user
 msgid "Hours Summary by User"
-msgstr ""
+msgstr "Rekapitulacija sati po korisniku"
 
 #. module: account_analytic_analysis
 #: view:account.analytic.account:0
 msgid "Contract"
-msgstr ""
+msgstr "Ugovor"
 
 #. module: account_analytic_analysis
 #: help:sale.config.settings,group_template_required:0
@@ -401,6 +584,8 @@
 "Allows you to set the template field as required when creating an analytic "
 "account or a contract."
 msgstr ""
+"Omogućuje vam da postavite polje predloška kao obvezno prilikom izrade "
+"analitičkog konta ili ugovora."
 
 #. module: account_analytic_analysis
 #: help:account.analytic.account,hours_qtt_invoiced:0
@@ -408,6 +593,8 @@
 "Number of time (hours/days) that can be invoiced plus those that already "
 "have been invoiced."
 msgstr ""
+"Vrijeme (sati / dani) koje se može fakturisati plus ono koje je već "
+"fakturisano."