diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 250a0446534..2c59fe26bf0 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -1394,7 +1394,12 @@ class account_invoice_line(osv.osv):
         # XXX this gets the default account for the user's company,
         # it should get the default account for the invoice's company
         # however, the invoice's company does not reach this point
-        prop = self.pool.get('ir.property').get(cr, uid, 'property_account_income_categ', 'product.category', context=context)
+        if context is None:
+            context = {}
+        if context.get('type') in ('out_invoice','out_refund'):
+            prop = self.pool.get('ir.property').get(cr, uid, 'property_account_income_categ', 'product.category', context=context)
+        else:
+            prop = self.pool.get('ir.property').get(cr, uid, 'property_account_expense_categ', 'product.category', context=context)
         return prop and prop.id or False
 
     _defaults = {
diff --git a/addons/account/i18n/es_MX.po b/addons/account/i18n/es_MX.po
index dbe6df94020..f425cc9a8ba 100644
--- a/addons/account/i18n/es_MX.po
+++ b/addons/account/i18n/es_MX.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-02-14 00:11+0000\n"
+"Last-Translator: OscarAlca <oszckar@gmail.com>\n"
 "Language-Team: Spanish (Mexico) <es_MX@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-18 06:30+0000\n"
-"X-Generator: Launchpad (build 16430)\n"
+"X-Launchpad-Export-Date: 2013-02-14 05:36+0000\n"
+"X-Generator: Launchpad (build 16491)\n"
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -5664,7 +5664,7 @@ msgstr ""
 #: selection:account.invoice.report,type:0
 #: selection:report.invoice.created,type:0
 msgid "Customer Refund"
-msgstr ""
+msgstr "Nota de crédito"
 
 #. module: account
 #: field:account.tax,ref_tax_sign:0
@@ -6186,7 +6186,7 @@ msgstr ""
 #: model:ir.actions.act_window,name:account.action_invoice_tree3
 #: model:ir.ui.menu,name:account.menu_action_invoice_tree3
 msgid "Customer Refunds"
-msgstr ""
+msgstr "Notas de crédito del cliente"
 
 #. module: account
 #: field:account.account,foreign_balance:0
diff --git a/addons/account/i18n/mn.po b/addons/account/i18n/mn.po
index b7b5092501c..fcde26ed560 100644
--- a/addons/account/i18n/mn.po
+++ b/addons/account/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-02-13 04:11+0000\n"
+"PO-Revision-Date: 2013-02-13 10:27+0000\n"
 "Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2013-02-14 05:36+0000\n"
 "X-Generator: Launchpad (build 16491)\n"
 
 #. module: account
@@ -610,7 +610,7 @@ msgstr "Данс энэ журнальд хэрэглэгдсэн"
 #: help:account.vat.declaration,chart_account_id:0
 #: help:accounting.report,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr "Дансны модоо сонго"
+msgstr "Дансны төлөвлөгөө сонго"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
@@ -994,7 +994,8 @@ msgstr "өдөр"
 msgid ""
 "If checked, the new chart of accounts will not contain this by default."
 msgstr ""
-"Хэрэв тэмдэглэгдсэн бол шинэ дансны мод нь үүнийг анхны байдлаараа агуулахгүй"
+"Хэрэв тэмдэглэгдсэн бол шинэ дансны төлөвлөгөө нь үүнийг анхны байдлаараа "
+"агуулахгүй"
 
 #. module: account
 #: model:ir.actions.act_window,help:account.action_account_manual_reconcile
@@ -2059,7 +2060,7 @@ msgstr "Бүх харицлагч"
 #. module: account
 #: view:account.analytic.chart:0
 msgid "Analytic Account Charts"
-msgstr "Аналитик дансны мод"
+msgstr "Аналитик дансны төлөвлөгөө"
 
 #. module: account
 #: report:account.overdue:0
@@ -2590,7 +2591,7 @@ msgstr ""
 #. module: account
 #: view:account.chart.template:0
 msgid "Search Chart of Account Templates"
-msgstr "Дансны Модны Үлгэр Хайх"
+msgstr "Дансны Төлөвлөгөөний Үлгэр Хайх"
 
 #. module: account
 #: report:account.invoice:0
@@ -3583,7 +3584,7 @@ msgstr "Байнга"
 msgid ""
 "Full accounting features: journals, legal statements, chart of accounts, etc."
 msgstr ""
-"Бүрэн санхүүгийн боломж: журнал, албан ёсны  хуулга, дансны мод, r.м."
+"Бүрэн санхүүгийн боломж: журнал, албан ёсны  хуулга, дансны төлөвлөгөө, r.м."
 
 #. module: account
 #: view:account.analytic.line:0
@@ -3645,7 +3646,7 @@ msgstr "Тулгалтын Сурвалж"
 #. module: account
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
-msgstr "Компани нь дансны модтой байна"
+msgstr "Компани нь дансны төлөвлөгөөтэй байна"
 
 #. module: account
 #: model:ir.model,name:account.model_account_tax_code_template
@@ -3852,7 +3853,7 @@ msgstr ""
 #: 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 "Дансны төлөвлөгөөний үлгэр"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -4109,6 +4110,11 @@ msgid ""
 "by\n"
 "                                    your supplier/customer."
 msgstr ""
+"Энэхүү кредит баримтыг шууд засварлаад батлаж болно\n"
+"                                    эсвэл үүнийг ноорог хэвээр нь хадгалаад\n"
+"                                    нийлүүлэгч/захиалагчаас ирэх баримтыг "
+"хүлээж\n"
+"                                    болно."
 
 #. module: account
 #: view:validate.account.move.lines:0
@@ -4126,6 +4132,8 @@ msgid ""
 "You have not supplied enough arguments to compute the initial balance, "
 "please select a period and a journal in the context."
 msgstr ""
+"Эхлэлийн балансыг тооцоолоход хүрэлцэх аргументийг дамжуулсангүй, агуулга "
+"дотор мөчлөг болон журналыг сонгоно уу."
 
 #. module: account
 #: model:ir.actions.report.xml,name:account.account_transfers
@@ -4135,12 +4143,12 @@ msgstr "Шилжүүлэлт"
 #. module: account
 #: field:account.config.settings,expects_chart_of_accounts:0
 msgid "This company has its own chart of accounts"
-msgstr "Энэ компани нь өөрийн дансны модтой байна"
+msgstr "Энэ компани нь өөрийн дансны төлөвлөгөөтэй байна"
 
 #. module: account
 #: view:account.chart:0
 msgid "Account charts"
-msgstr "Дансны мод"
+msgstr "Дансны төлөвлөгөө"
 
 #. module: account
 #: view:cash.box.out:0
@@ -4176,6 +4184,18 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Захиалагчийн нэхэмжлэлийг үүсгэхдээ дарна.\n"
+"              </p><p>\n"
+"                OpenERP-н цахим нэхэмжлэл нь захиалагчийн төлбөрийг \n"
+"                цуглуулах ажлыг хялбарчлах, хурдасгах боломжийг олгоно. \n"
+"                Захиалагч имэйлээр нэхэмжлэлийг хүлээн авах бөгөөд \n"
+"                онлайнаар төлөх эсвэл импортлох боломжтой. \n"
+"              </p><p>\n"
+"                Нэхэмжлэлийн доод талд захиалагчтай харилцсан түүх шууд \n"
+"                ил харагдана.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: field:account.tax.code,name:0
@@ -4207,6 +4227,8 @@ msgid ""
 "You cannot modify a posted entry of this journal.\n"
 "First you should set the journal to allow cancelling entries."
 msgstr ""
+"Энэ журналын илгээгдсэн бичлэгийг засварлах боломжгүй.\n"
+"Эхлээд журналыг цуцлахыг зөвшөөрдөг болгох хэрэгтэй."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_print_sale_purchase_journal
@@ -4231,6 +4253,8 @@ msgid ""
 "There is no fiscal year defined for this date.\n"
 "Please create one from the configuration of the accounting menu."
 msgstr ""
+"Энэ огноонд санхүүгийн жил тодорхойлогдоогүй байна.\n"
+"Санхүүгийн менюний тохиргоо хэсгээс үүсгэнэ үү."
 
 #. module: account
 #: view:account.addtmpl.wizard:0
@@ -4242,7 +4266,7 @@ msgstr "Данс үүсгэх"
 #: code:addons/account/wizard/account_fiscalyear_close.py:62
 #, python-format
 msgid "The entries to reconcile should belong to the same company."
-msgstr ""
+msgstr "Тулгах бичилтүүд нь ижил компанид харъяалагдаж байх ёстой."
 
 #. module: account
 #: field:account.invoice.tax,tax_amount:0
@@ -4263,6 +4287,7 @@ msgstr "Задаргаа"
 #: help:account.config.settings,default_purchase_tax:0
 msgid "This purchase tax will be assigned by default on new products."
 msgstr ""
+"Энэ худалдан авалтын татвар нь автоматаар шинээр үүсгэсэн бараанд олгогдоно."
 
 #. module: account
 #: report:account.invoice:0
@@ -4280,7 +4305,7 @@ msgstr "НӨАТ :"
 #: model:ir.actions.act_window,name:account.action_account_tree
 #: model:ir.ui.menu,name:account.menu_action_account_tree2
 msgid "Chart of Accounts"
-msgstr "Дансны мод"
+msgstr "Дансны төлөвлөгөө"
 
 #. module: account
 #: view:account.tax.chart:0
@@ -4290,7 +4315,7 @@ msgstr "(Хэрэв та мөчлөг сонгохгүй бол бүх нээл
 #. 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
@@ -4360,7 +4385,7 @@ msgstr "Тулгалтыг арилгах"
 #. module: account
 #: view:account.chart.template:0
 msgid "Chart of Accounts Template"
-msgstr "Загвар дансны мод"
+msgstr "Дансны төлөвлөгөөний үлгэр"
 
 #. module: account
 #: code:addons/account/account.py:2310
@@ -4431,7 +4456,7 @@ msgstr ""
 #. module: account
 #: field:account.config.settings,group_check_supplier_invoice_total:0
 msgid "Check the total of supplier invoices"
-msgstr ""
+msgstr "Нийлүүлэгчийн нэхэмжлэлийн дүнг шалгана уу"
 
 #. module: account
 #: view:account.tax:0
@@ -4445,6 +4470,8 @@ msgid ""
 "When monthly periods are created. The status is 'Draft'. At the end of "
 "monthly period it is in 'Done' status."
 msgstr ""
+"Сараар мөчлөгийг үүсгэгдэхэд төлөв нь 'Ноорог' байна. Сарын мөчлөгийн "
+"төгсгөлд энэ нь 'Хийгдсэн' төлөвтэй болно."
 
 #. module: account
 #: view:account.invoice.report:0
@@ -4520,7 +4547,7 @@ msgstr "Татварын кодын үржүүлэх коэффициент"
 #. module: account
 #: field:account.config.settings,complete_tax_set:0
 msgid "Complete set of taxes"
-msgstr ""
+msgstr "Татварын олонлогуудыг гүйцээнэ үү"
 
 #. module: account
 #: field:account.account,name:0
@@ -4538,12 +4565,12 @@ msgstr "Нэр"
 #: code:addons/account/installer.py:94
 #, python-format
 msgid "No unconfigured company !"
-msgstr ""
+msgstr "Тохируулаагүй компани алга !"
 
 #. module: account
 #: field:res.company,expects_chart_of_accounts:0
 msgid "Expects a Chart of Accounts"
-msgstr ""
+msgstr "Дансны төлөвлөгөөг гэж таамаглана"
 
 #. module: account
 #: field:account.move.line,date:0
@@ -4554,7 +4581,7 @@ msgstr "Огноо"
 #: code:addons/account/wizard/account_fiscalyear_close.py:100
 #, python-format
 msgid "The journal must have default credit and debit account."
-msgstr ""
+msgstr "Журнал нь үндсэн утга байх дебит, кредит данстай байх ёстой."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_bank_tree
@@ -4565,7 +4592,7 @@ msgstr "Банкы дансдаа тохируулах"
 #. module: account
 #: xsl:account.transfer:0
 msgid "Partner ID"
-msgstr ""
+msgstr "Харилцагчийн ID"
 
 #. module: account
 #: help:account.bank.statement,message_ids:0
@@ -4605,13 +4632,15 @@ msgid ""
 "Check this box if you don't want any tax related to this tax Code to appear "
 "on invoices."
 msgstr ""
+"Хэрэв нэхэмжлэл дээр энэ кодтой холбогдсон ямарваа дансыг харуулахгүй байхыг "
+"энэ сонголтыг тэмдэглэнэ."
 
 #. module: account
 #: code:addons/account/account_move_line.py:1061
 #: code:addons/account/account_move_line.py:1144
 #, python-format
 msgid "You cannot use an inactive account."
-msgstr ""
+msgstr "Идэвхгүй дансыг хэрэглэх боломжгүй."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.open_board_account
@@ -4732,7 +4761,7 @@ msgstr "(Нээх гэж буй нэхэмжлэл нь тулгагдаагүй
 #. 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
@@ -4770,6 +4799,8 @@ msgid ""
 "This payment term will be used instead of the default one for sale orders "
 "and customer invoices"
 msgstr ""
+"Энэ төлбөрийн нөхцөл нь борлуулалтын захиалга, захиалагчийн нэхэмжлэлийн "
+"үндсэн утгын оронд хэрэглэгдэнэ."
 
 #. module: account
 #: view:account.config.settings:0
@@ -4777,6 +4808,7 @@ msgid ""
 "If you put \"%(year)s\" in the prefix, it will be replaced by the current "
 "year."
 msgstr ""
+"Хэрэв \"%(year)s\" гэж угтварт нь тавьбал энэ одоогийн жилээр солигдоно."
 
 #. module: account
 #: help:account.account,active:0
@@ -4794,7 +4826,7 @@ msgstr "Батлагдсан журналын бичилтүүд"
 #. module: account
 #: field:account.move.line,blocked:0
 msgid "No Follow-up"
-msgstr ""
+msgstr "Дагаж хийх зүйлс байхгүй"
 
 #. module: account
 #: view:account.tax.template:0
@@ -4813,6 +4845,9 @@ msgid ""
 "9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: "
 "0.0231 EUR."
 msgstr ""
+"Тухайлбал, аравны нарийвчлалын орон нь 2 гэж байвал журналын бичилт нь "
+"дараах байдалтай байна: 9.99 EUR, харин аравны нарийвчлалын орон нь 4 гэж "
+"байвал дараах байдалтай байна: 0.0231 EUR."
 
 #. module: account
 #: field:account.account,shortcut:0
@@ -4876,6 +4911,17 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Шинэ банкны данс тохируулахдаа дарна. \n"
+"          </p><p>\n"
+"            Компанийн банкны дансуудыг тохируулаад тайлангийн\n"
+"            хөлд харагдах дансыг нь сонгоно.\n"
+"          </p><p>\n"
+"            Хэрэв OpenERP-н санхүүгийн модулийг ашиглаж байгаа бол\n"
+"             журнал болон санхүүгийн данс нь тохируулсан өгөгдөл дээрээс\n"
+"             шууд үүснэ.\n"
+"          </p>\n"
+"        "
 
 #. module: account
 #: constraint:account.tax.code.template:0
@@ -4883,6 +4929,8 @@ msgid ""
 "Error!\n"
 "You cannot create recursive Tax Codes."
 msgstr ""
+"Алдаа!\n"
+"Тойрог хамааралтай татварын код үүсгэж болохгүй."
 
 #. module: account
 #: constraint:account.period:0
@@ -4890,6 +4938,8 @@ msgid ""
 "Error!\n"
 "The duration of the Period(s) is/are invalid."
 msgstr ""
+"Алдаа!\n"
+"Мөчлөгийн үргэлжлэх хугацаа буруу байна."
 
 #. module: account
 #: field:account.entries.report,month:0
@@ -4906,7 +4956,7 @@ msgstr "Сар"
 #: code:addons/account/account.py:668
 #, python-format
 msgid "You cannot change the code of account which contains journal items!"
-msgstr ""
+msgstr "Журналын бичилт агуулж байгаа дансны кодыг өөрчлөж болохгүй!"
 
 #. module: account
 #: field:account.config.settings,purchase_sequence_prefix:0
@@ -4921,6 +4971,8 @@ msgid ""
 "Cannot find a chart of account, you should create one from Settings\\"
 "Configuration\\Accounting menu."
 msgstr ""
+"Дансны төлөвлөгөөг олохгүй байна. Санхүү меню дахь Тохиргоо\\Тохиргоо "
+"хэсгээс үүсгэнэ."
 
 #. module: account
 #: field:account.entries.report,product_uom_id:0
@@ -4942,7 +4994,7 @@ msgstr "Дансны төрөл"
 #. module: account
 #: selection:account.journal,type:0
 msgid "Bank and Checks"
-msgstr ""
+msgstr "Банк болон Чек"
 
 #. module: account
 #: field:account.account.template,note:0
@@ -4970,7 +5022,7 @@ msgstr "Хоосон орхивол өнөөдрийн огноо сонгогд
 #: view:account.bank.statement:0
 #: field:account.cashbox.line,subtotal_closing:0
 msgid "Closing Subtotal"
-msgstr ""
+msgstr "Хаалтын Дэд дүн"
 
 #. module: account
 #: field:account.tax,base_code_id:0
@@ -4982,7 +5034,7 @@ msgstr "Account Base Code"
 #, python-format
 msgid ""
 "You have to provide an account for the write off/exchange difference entry."
-msgstr ""
+msgstr "Та Хасагдуулга/солилцооны ялгааны дансыг зааж өгөх ёстой."
 
 #. module: account
 #: help:res.company,paypal_account:0
@@ -5025,7 +5077,7 @@ msgstr "Хэрэв тэг үлдэгдэлтэй дансуудыг харахы
 #. module: account
 #: field:account.move.reconcile,opening_reconciliation:0
 msgid "Opening Entries Reconciliation"
-msgstr ""
+msgstr "Нээлтийн Бичилтийн Тулгалт"
 
 #. module: account
 #. openerp-web
@@ -5037,7 +5089,7 @@ msgstr "Сүүлчийн тулгалт:"
 #. module: account
 #: selection:account.move.line,state:0
 msgid "Balanced"
-msgstr ""
+msgstr "Балансалсан"
 
 #. module: account
 #: model:process.node,note:account.process_node_importinvoice0
@@ -5051,16 +5103,18 @@ msgid ""
 "There is currently no company without chart of account. The wizard will "
 "therefore not be executed."
 msgstr ""
+"Одоогоор дансны төлөвлөгөө үгүй компани байхгүй байна. Иймээс харилцах цонх "
+"нь ажиллахгүй."
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_wizard_multi_chart
 msgid "Set Your Accounting Options"
-msgstr ""
+msgstr "Санхүүгийн сонголтуудыг тохируулах"
 
 #. module: account
 #: model:ir.model,name:account.model_account_chart
 msgid "Account chart"
-msgstr "Дансны мод"
+msgstr "Дансны төлөвлөгөө"
 
 #. module: account
 #: field:account.invoice,reference_type:0
@@ -5149,7 +5203,7 @@ msgstr "Мөчлөгийн нэр компаний хэмжээнд үл дав
 #. module: account
 #: help:wizard.multi.charts.accounts,currency_id:0
 msgid "Currency as per company's country."
-msgstr ""
+msgstr "Компанийн хэмжээнд улсын валют"
 
 #. module: account
 #: view:account.tax:0
@@ -5169,7 +5223,7 @@ msgid ""
 "you want to generate accounts of this template only when loading its child "
 "template."
 msgstr ""
-"Хэрэв энэ үлгэр нь Дансны Модыг үүсгэх харилцах цонхонд хэрэглэхээргүй "
+"Хэрэв энэ үлгэр нь Дансны Төлөвлөгөөг үүсгэх харилцах цонхонд хэрэглэхээргүй "
 "байвал  энэ тэмдэглэгээг арилгана. Энэ нь зөвхөн дэд үлгэрийг дуудаж дэд "
 "дансдыг үүсгэхэд л хэрэгтэй."
 
@@ -5190,6 +5244,8 @@ msgid ""
 "Error!\n"
 "You cannot create an account which has parent account of different company."
 msgstr ""
+"Алдаа!\n"
+"Өөр компанийн дансыг эцэг дансаа болгосон данс үүсгэж болохгүй."
 
 #. module: account
 #: code:addons/account/account_invoice.py:631
@@ -5229,7 +5285,7 @@ msgstr "Давтан гүйлгээний загвар"
 #. module: account
 #: view:account.tax:0
 msgid "Children/Sub Taxes"
-msgstr ""
+msgstr "Охин/Дэд татвар"
 
 #. module: account
 #: xsl:account.transfer:0
@@ -5261,12 +5317,12 @@ msgstr "Цуцлагдсан"
 #. module: account
 #: help:account.config.settings,group_proforma_invoices:0
 msgid "Allows you to put invoices in pro-forma state."
-msgstr ""
+msgstr "Нэхэмжлэлийг урьдчилсан төлөвт тавих боломжийг олгоно."
 
 #. module: account
 #: view:account.journal:0
 msgid "Unit Of Currency Definition"
-msgstr ""
+msgstr "Валютын нэгжний тодорхойлолт"
 
 #. module: account
 #: help:account.partner.ledger,amount_currency:0
@@ -5275,6 +5331,7 @@ msgid ""
 "It adds the currency column on report if the currency differs from the "
 "company currency."
 msgstr ""
+"Энэ нь тайланд валют баганыг хэрэв компанийн валютаас ялгаатай байвал нэмнэ."
 
 #. module: account
 #: code:addons/account/account.py:3346
@@ -5349,6 +5406,9 @@ msgid ""
 "printed it comes to 'Printed' status. When all transactions are done, it "
 "comes in 'Done' status."
 msgstr ""
+"Журналын мөчлөг нь үүсгэгдмэгцээ 'Ноорог' төлөвтэй байна. Хэрэв тайлан "
+"хэвлэгдвэл 'Хэвлэгдсэн' төлөвт шилжинэ. Бүх гүйлгээ хийгдсэн бол 'Хийгдсэн' "
+"төлөвт шилжинэ."
 
 #. module: account
 #: code:addons/account/account.py:3157
@@ -5377,7 +5437,7 @@ msgstr "Нэхэмжлэл"
 #. module: account
 #: help:account.config.settings,expects_chart_of_accounts:0
 msgid "Check this box if this company is a legal entity."
-msgstr ""
+msgstr "Хэрэв энэ компани нь хуулийн этгээд бол энэ талбарыг тэмдэглэ."
 
 #. module: account
 #: model:account.account.type,name:account.conf_account_type_chk
@@ -5494,6 +5554,8 @@ msgid ""
 "Set the account that will be set by default on invoice tax lines for "
 "invoices. Leave empty to use the expense account."
 msgstr ""
+"Нэхэмжлэлийн татварын мөрөнд автоматаар сонгогдох дансыг тохируулж өгнө. "
+"Хэрэв зардлын дансыг хэрэглэхээр бол хоосон үлдээнэ."
 
 #. module: account
 #: code:addons/account/account.py:890
@@ -5529,6 +5591,8 @@ msgid ""
 "Please verify the price of the invoice !\n"
 "The encoded total does not match the computed total."
 msgstr ""
+"Нэхэмжлэлийн үнийг шалгана уу !\n"
+"Оруулсан нийт дүн тооцоолсон нийт дүнтэй таарахгүй байна."
 
 #. module: account
 #: field:account.account,active:0
@@ -5544,7 +5608,7 @@ msgstr "Идэвхитэй"
 #: view:account.bank.statement:0
 #: field:account.journal,cash_control:0
 msgid "Cash Control"
-msgstr ""
+msgstr "Кассын хяналт"
 
 #. module: account
 #: field:account.analytic.balance,date2:0
@@ -5615,7 +5679,7 @@ msgstr "Ажил гүйлгээ"
 #: field:account.bank.statement,details_ids:0
 #: view:account.journal:0
 msgid "CashBox Lines"
-msgstr ""
+msgstr "Кассын мөрүүд"
 
 #. module: account
 #: model:ir.model,name:account.model_account_vat_declaration
@@ -5628,6 +5692,8 @@ 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 ""
+"Хэрэв энэ талбарыг тэмдэглэхгүй бол нэхэмжлэл, төлбөрийг хийх боломжтой байх "
+"боловч санхүүг хөтлөж чадахгүй (Журналын бичилт, Дансны төлөвлөгөө, ...)"
 
 #. module: account
 #: view:account.period:0
@@ -5706,12 +5772,14 @@ msgstr "Хэрэглэх гүйлгээ"
 msgid ""
 "Move cannot be deleted if linked to an invoice. (Invoice: %s - Move ID:%s)"
 msgstr ""
+"Хөдөлгөөн хэрэв энэ нэхэмжлэлтэй холбогдсон бол устгагдах боломжгүй. "
+"(Нэхэмжлэл:  %s - Хөдөлгөөн ID:%s)"
 
 #. module: account
 #: view:account.bank.statement:0
 #: help:account.cashbox.line,number_opening:0
 msgid "Opening Unit Numbers"
-msgstr ""
+msgstr "Нээлтийн нэгжийн тоонууд"
 
 #. module: account
 #: field:account.subscription,period_type:0
@@ -5793,11 +5861,14 @@ msgid ""
 "Put a sequence in the journal definition for automatic numbering or create a "
 "sequence manually for this piece."
 msgstr ""
+"Энэ зүйлд автомат дарааллын дугаарыг үүсгэж чадахгүй.\n"
+"Журналын тодорхойлолтыг дарааллыг сонгож өгөх хэрэгтэй эсвэл энэ зүйлд "
+"дугаарыг гараараа оруулж явна."
 
 #. module: account
 #: view:account.invoice:0
 msgid "Pro Forma Invoice "
-msgstr ""
+msgstr "Урьдчилсан нэхэмжлэл "
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -5862,7 +5933,7 @@ msgstr "Тооцоолох програмчлалын код (хэрэв төр
 #, python-format
 msgid ""
 "Cannot find a chart of accounts for this company, you should create one."
-msgstr ""
+msgstr "Энэ компаний дансны төлөвлөгөө олдохгүй байна, үүсгэнэ үү."
 
 #. module: account
 #: selection:account.analytic.journal,type:0
@@ -6186,7 +6257,7 @@ msgstr "Төлбөрийн огноо"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,opening_details_ids:0
 msgid "Opening Cashbox Lines"
-msgstr ""
+msgstr "Кассын Нээлтийн Мөрүүд"
 
 #. module: account
 #: view:account.analytic.account:0
@@ -6598,6 +6669,8 @@ msgid ""
 "You cannot validate this journal entry because account \"%s\" does not "
 "belong to chart of accounts \"%s\"."
 msgstr ""
+"Энэ журналын бичилтийг батлаж чадахгүй учир нь данс \"%s\" нь \"%s\" дансны "
+"төлөвлөгөөнд харъяалагдахгүй."
 
 #. module: account
 #: view:account.financial.report:0
@@ -7862,7 +7935,7 @@ msgstr "Үнэ"
 #: view:account.bank.statement:0
 #: field:account.bank.statement,closing_details_ids:0
 msgid "Closing Cashbox Lines"
-msgstr ""
+msgstr "Кассын Хаалтын Мөрүүд"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -8127,6 +8200,24 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p>\n"
+"                Шинэ шинжилгээний данс үүсгэхдээ дарна.\n"
+"              </p><p>\n"
+"                Энгийн дансны төлөвлөгөө нь улс орны хууль, эрх зүйн\n"
+"                дагууд тодорхойлогдсон бүтэцтэц байдаг. Харин шинжилгээний\n"
+"                дансны төлөвлөгөө нь өөрийн бизнесийн хэрэгцээ шаардлагын\n"
+"                дагууд өртөг/орлого зэрэгийн тайлангийн дагууд бүтэцтэй "
+"байна.\n"
+"              </p><p>\n"
+"                Ихэвчлэн гэрээнүүд, төслүүд, бүтээгдэхүүнүүд, хэлтсүүд гэсэн "
+"\n"
+"                байдлаар бүтэцлэгдсэн байдаг. OpenERP-н ихэнх үйлдлүүд нь "
+"(нэхэмжлэл,\n"
+"                цаг бүртгэлийн хуудас, зардал, гм) санхүүгийн бичилтэй "
+"холбогдох \n"
+"                шинжилгээний бичилтийг мөн давхар тогтмол үүсгэдэг.\n"
+"              </p>\n"
+"            "
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_view
@@ -8263,6 +8354,7 @@ msgid ""
 "You have to set a code for the bank account defined on the selected chart of "
 "accounts."
 msgstr ""
+"Сонгосон дансны төлөвгөөнд банкны дансны кодыг тодорхойлж өгөх хэрэгтэй."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_manual_reconcile
@@ -8326,7 +8418,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_chart_template
 msgid "Templates for Account Chart"
-msgstr "Дансны модны загвар"
+msgstr "Дансны төлөвлөгөөний үлгэр"
 
 #. module: account
 #: help:account.model.line,sequence:0
@@ -8523,7 +8615,7 @@ msgstr ""
 #. module: account
 #: model:ir.model,name:account.model_account_cashbox_line
 msgid "CashBox Line"
-msgstr "Кассын мөнгө"
+msgstr "Кассын мөр"
 
 #. module: account
 #: field:account.installer,charts:0
@@ -8716,7 +8808,7 @@ msgstr "Нийт үлдэгдэл"
 #. module: account
 #: view:account.bank.statement:0
 msgid "Opening Cash Control"
-msgstr ""
+msgstr "Кассын нээлтийн хяналт"
 
 #. module: account
 #: model:process.node,note:account.process_node_invoiceinvoice0
@@ -10085,7 +10177,7 @@ msgstr "7 сар"
 #. module: account
 #: view:account.account:0
 msgid "Chart of accounts"
-msgstr "Дансны мод"
+msgstr "Дансны төлөвлөгөө"
 
 #. module: account
 #: field:account.subscription.line,subscription_id:0
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 72d30c11cfd..53c604161ea 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -151,12 +151,12 @@ class account_config_settings(osv.osv_memory):
         self.write(cr, uid, [id], vals, context)
         return id
 
-    def onchange_company_id(self, cr, uid, ids, company_id):
+    def onchange_company_id(self, cr, uid, ids, company_id, context=None):
         # update related fields
         values = {}
         values['currency_id'] = False
         if company_id:
-            company = self.pool.get('res.company').browse(cr, uid, company_id)
+            company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
             has_chart_of_accounts = company_id not in self.pool.get('account.installer').get_unconfigured_cmp(cr, uid)
             fiscalyear_count = self.pool.get('account.fiscalyear').search_count(cr, uid,
                 [('date_start', '<=', time.strftime('%Y-%m-%d')), ('date_stop', '>=', time.strftime('%Y-%m-%d')),
diff --git a/addons/account/res_config_view.xml b/addons/account/res_config_view.xml
index 4bfd3697d89..7977c0fc505 100644
--- a/addons/account/res_config_view.xml
+++ b/addons/account/res_config_view.xml
@@ -33,7 +33,7 @@
                                 <label for="company_id" string="Select Company"/>
                                 <field name="company_id"
                                     widget="selection"
-                                    on_change="onchange_company_id(company_id)"
+                                    on_change="onchange_company_id(company_id, context)"
                                     class="oe_inline"/>
                             </div>
                             <div>
diff --git a/addons/account_asset/account_asset.py b/addons/account_asset/account_asset.py
index b7330352b12..b335063b758 100644
--- a/addons/account_asset/account_asset.py
+++ b/addons/account_asset/account_asset.py
@@ -331,6 +331,9 @@ class account_asset_asset(osv.osv):
         depreciation_obj = self.pool.get('account.asset.depreciation.line')
         period = period_obj.browse(cr, uid, period_id, context=context)
         depreciation_ids = depreciation_obj.search(cr, uid, [('asset_id', 'in', ids), ('depreciation_date', '<=', period.date_stop), ('depreciation_date', '>=', period.date_start), ('move_check', '=', False)], context=context)
+        if context is None:
+            context = {}
+        context.update({'depreciation_date':period.date_stop})
         return depreciation_obj.create_move(cr, uid, depreciation_ids, context=context)
 
     def create(self, cr, uid, vals, context=None):
@@ -388,7 +391,7 @@ class account_asset_depreciation_line(osv.osv):
         created_move_ids = []
         asset_ids = []
         for line in self.browse(cr, uid, ids, context=context):
-            depreciation_date = time.strftime('%Y-%m-%d')
+            depreciation_date = context.get('depreciation_date') or time.strftime('%Y-%m-%d')
             period_ids = period_obj.find(cr, uid, depreciation_date, context=context)
             company_currency = line.asset_id.company_id.currency_id.id
             current_currency = line.asset_id.currency_id.id
diff --git a/addons/account_voucher/account_voucher.py b/addons/account_voucher/account_voucher.py
index d615eaf7d8c..b0176caa101 100644
--- a/addons/account_voucher/account_voucher.py
+++ b/addons/account_voucher/account_voucher.py
@@ -50,13 +50,25 @@ class account_config_settings(osv.osv_memory):
             'company_id', 'income_currency_exchange_account_id',
             type='many2one',
             relation='account.account',
-            string="Gain Exchange Rate Account"),
+            string="Gain Exchange Rate Account", 
+            domain="[('type', '=', 'other')]"),
         'expense_currency_exchange_account_id': fields.related(
             'company_id', 'expense_currency_exchange_account_id',
             type="many2one",
             relation='account.account',
-            string="Loss Exchange Rate Account"),
+            string="Loss Exchange Rate Account",
+            domain="[('type', '=', 'other')]"),
     }
+    def onchange_company_id(self, cr, uid, ids, company_id, context=None):
+        res = super(account_config_settings, self).onchange_company_id(cr, uid, ids, company_id, context=context)
+        if company_id:
+            company = self.pool.get('res.company').browse(cr, uid, company_id, context=context)
+            res['value'].update({'income_currency_exchange_account_id': company.income_currency_exchange_account_id and company.income_currency_exchange_account_id.id or False, 
+                                 'expense_currency_exchange_account_id': company.expense_currency_exchange_account_id and company.expense_currency_exchange_account_id.id or False})
+        else: 
+            res['value'].update({'income_currency_exchange_account_id': False, 
+                                 'expense_currency_exchange_account_id': False})
+        return res
 
 class account_voucher(osv.osv):
     def _check_paid(self, cr, uid, ids, name, args, context=None):
diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 5a204d605d6..b869f6c83b2 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -307,8 +307,9 @@
                         </group>
                         <group>
                             <field name="date" invisible="context.get('line_type', False)" on_change="onchange_date(date, currency_id, payment_rate_currency_id, amount, company_id, context)"/>
+                            <field name="period_id"/>
                             <field name="reference" invisible="context.get('line_type', False)" string="Payment Ref" placeholder="e.g. 003/10"/>
-                            <field name="name" colspan="2" invisible="context.get('line_type', False)" placeholder="e.g. Invoice SAJ/0042"/>
+                            <field name="name" invisible="context.get('line_type', False)" placeholder="e.g. Invoice SAJ/0042"/>
                             <field name="company_id" widget="selection" groups="base.group_multi_company"/>
 
                             <field name="account_id"
diff --git a/addons/auth_crypt/i18n/ru.po b/addons/auth_crypt/i18n/ru.po
index 9701a6ba556..b13e2c0effb 100644
--- a/addons/auth_crypt/i18n/ru.po
+++ b/addons/auth_crypt/i18n/ru.po
@@ -1,75 +1,28 @@
 # Russian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-03 16:03+0000\n"
-"PO-Revision-Date: 2012-12-07 08:15+0000\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-13 09:46+0000\n"
 "Last-Translator: Denis Karataev <dskarataev@gmail.com>\n"
 "Language-Team: Russian <ru@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-12-08 04:59+0000\n"
-"X-Generator: Launchpad (build 16341)\n"
+"X-Launchpad-Export-Date: 2013-02-14 05:36+0000\n"
+"X-Generator: Launchpad (build 16491)\n"
 
-#. module: base_crypt
-#: model:ir.model,name:base_crypt.model_res_users
+#. module: auth_crypt
+#: field:res.users,password_crypt:0
+msgid "Encrypted Password"
+msgstr "Зашифрованный пароль"
+
+#. module: auth_crypt
+#: model:ir.model,name:auth_crypt.model_res_users
 msgid "Users"
 msgstr "Пользователи"
-
-#~ msgid "res.users"
-#~ msgstr "res.users"
-
-#, python-format
-#~ msgid "Error"
-#~ msgstr "Error"
-
-#, python-format
-#~ msgid "Please specify the password !"
-#~ msgstr "Необходимо указать пароль!"
-
-#~ msgid "The chosen company is not in the allowed companies for this user"
-#~ msgstr ""
-#~ "Выбранная организация отсутствует в списке разрешённых для этого пользователя"
-
-#~ msgid "You can not have two users with the same login !"
-#~ msgstr "Не может быть двух пользователей с одинаковым именем пользователя!"
-
-#~ msgid "Base - Password Encryption"
-#~ msgstr "Основной - Шифрование паролей"
-
-#~ msgid ""
-#~ "This module replaces the cleartext password in the database with a password "
-#~ "hash,\n"
-#~ "preventing anyone from reading the original password.\n"
-#~ "For your existing user base, the removal of the cleartext passwords occurs "
-#~ "the first time\n"
-#~ "a user logs into the database, after installing base_crypt.\n"
-#~ "After installing this module it won't be possible to recover a forgotten "
-#~ "password for your\n"
-#~ "users, the only solution is for an admin to set a new password.\n"
-#~ "\n"
-#~ "Note: installing this module does not mean you can ignore basic security "
-#~ "measures,\n"
-#~ "as the password is still transmitted unencrypted on the network (by the "
-#~ "client),\n"
-#~ "unless you are using a secure protocol such as XML-RPCS.\n"
-#~ "                    "
-#~ msgstr ""
-#~ "Этот модуль заменяет текстовые пароли в базе данных на их хэши,\n"
-#~ "предотвращая хищение оригинальных паролей.\n"
-#~ "Для существующей базы пользователей, удаление текстового пароля происходит "
-#~ "при\n"
-#~ "первом входе пользователя после установки base_crypt.\n"
-#~ "После установки этого модуля станет невозможно восстановление пароля \n"
-#~ "пользователя. Возможна будет только замена пароля.\n"
-#~ "\n"
-#~ "Прим.: установка этого модуля не избавляет от необходимости соблюдать\n"
-#~ "базовые меры безопасности, поскольку пароли всё ещё передаются открытым\n"
-#~ "текстом по сети, если не используется безопасный протокол вроде XML-RPCS.\n"
-#~ "                    "
diff --git a/addons/auth_oauth_signup/i18n/ru.po b/addons/auth_oauth_signup/i18n/ru.po
new file mode 100644
index 00000000000..2bb35847b10
--- /dev/null
+++ b/addons/auth_oauth_signup/i18n/ru.po
@@ -0,0 +1,23 @@
+# Russian translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:05+0000\n"
+"PO-Revision-Date: 2013-02-13 09:46+0000\n"
+"Last-Translator: Denis Karataev <dskarataev@gmail.com>\n"
+"Language-Team: Russian <ru@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-02-14 05:36+0000\n"
+"X-Generator: Launchpad (build 16491)\n"
+
+#. module: auth_oauth_signup
+#: model:ir.model,name:auth_oauth_signup.model_res_users
+msgid "Users"
+msgstr "Пользователи"
diff --git a/addons/base_calendar/crm_meeting_view.xml b/addons/base_calendar/crm_meeting_view.xml
index c2adc01cd54..d9b659b91fa 100644
--- a/addons/base_calendar/crm_meeting_view.xml
+++ b/addons/base_calendar/crm_meeting_view.xml
@@ -234,11 +234,12 @@
         <field name="arch" type="xml">
             <search string="Search Meetings">
                 <field name="name" string="Meeting" filter_domain="[('name','ilike',self)]"/>
-                <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
+                <field name="partner_ids"/>
+                <field name="categ_ids"/>
+                <field name="user_id"/>
                 <separator/>
                 <filter string="My Meetings" help="My Meetings" domain="[('user_id','=',uid)]"/>
-                <field name="user_id"/>
-                <field name="partner_ids"/>
+                <filter string="Unread Messages" name="message_unread" domain="[('message_unread','=',True)]"/>
             </search>
         </field>
     </record>
diff --git a/addons/base_calendar/i18n/cs.po b/addons/base_calendar/i18n/cs.po
index 02184604710..bc88b5e0cb2 100644
--- a/addons/base_calendar/i18n/cs.po
+++ b/addons/base_calendar/i18n/cs.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2013-02-12 18:30+0000\n"
+"PO-Revision-Date: 2013-02-13 19:13+0000\n"
 "Last-Translator: Radomil Urbánek <radek@sluzebnik.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2013-02-14 05:36+0000\n"
 "X-Generator: Launchpad (build 16491)\n"
 
 #. module: base_calendar
@@ -68,7 +68,7 @@ msgstr "Opakovaná schůzka"
 #. module: base_calendar
 #: model:crm.meeting.type,name:base_calendar.categ_meet5
 msgid "Feedback Meeting"
-msgstr ""
+msgstr "Objednaná schůzka"
 
 #. module: base_calendar
 #: model:ir.actions.act_window,name:base_calendar.action_res_alarm_view
@@ -185,7 +185,7 @@ msgstr "Pokud je zaškrtnuto, nové zprávy vyžadují vaši pozornost."
 #. module: base_calendar
 #: help:calendar.attendee,rsvp:0
 msgid "Indicats whether the favor of a reply is requested"
-msgstr ""
+msgstr "Vyznačuje, je-li vyžadováno odsouhlasení."
 
 #. module: base_calendar
 #: field:calendar.alarm,alarm_id:0
@@ -303,7 +303,7 @@ msgstr "Stav podílení účastníka"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Mail To"
-msgstr ""
+msgstr "Odeslat na"
 
 #. module: base_calendar
 #: field:crm.meeting,name:0
@@ -360,6 +360,8 @@ msgid ""
 "Holds the Chatter summary (number of messages, ...). This summary is "
 "directly in html format in order to be inserted in kanban views."
 msgstr ""
+"Udržuje souhrn klábosení (počet zpráv, ...). Tento souhrn je přímo ve "
+"formátu HTML aby jej bylo možné vložit do pohledů kanban."
 
 #. module: base_calendar
 #: code:addons/base_calendar/base_calendar.py:399
@@ -528,7 +530,7 @@ msgstr "Informace budíku události"
 #: code:addons/base_calendar/base_calendar.py:1010
 #, python-format
 msgid "Count cannot be negative or 0."
-msgstr ""
+msgstr "Počet nemůže být záporný nebo nulový."
 
 #. module: base_calendar
 #: field:crm.meeting,create_date:0
@@ -547,7 +549,7 @@ msgstr "Událost"
 #: selection:calendar.todo,rrule_type:0
 #: selection:crm.meeting,rrule_type:0
 msgid "Month(s)"
-msgstr ""
+msgstr "měsíc"
 
 #. module: base_calendar
 #: view:calendar.event:0
@@ -569,7 +571,7 @@ msgstr "URL Caldav"
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_mail_wizard_invite
 msgid "Invite wizard"
-msgstr ""
+msgstr "Průvodce pozvánkou"
 
 #. module: base_calendar
 #: selection:calendar.event,month_list:0
@@ -1127,7 +1129,7 @@ msgstr ""
 #: field:calendar.todo,end_type:0
 #: field:crm.meeting,end_type:0
 msgid "Recurrence Termination"
-msgstr ""
+msgstr "Ukončení opakování"
 
 #. module: base_calendar
 #: view:crm.meeting:0
@@ -1185,6 +1187,14 @@ msgid ""
 "          </p>\n"
 "        "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"            Klepněte pro naplánování nové schůzky.\n"
+"          </p><p>\n"
+"            Kalendář je sdílen zaměstnanci a je propojen\n"
+"            s dalšími moduly, jako dovolené zaměstnanců nebo obchodní\n"
+"            příležitosti.\n"
+"          </p>\n"
+"        "
 
 #. module: base_calendar
 #: help:calendar.alarm,description:0
@@ -1330,7 +1340,7 @@ msgstr "ir.values"
 #. module: base_calendar
 #: view:crm.meeting:0
 msgid "Search Meetings"
-msgstr ""
+msgstr "Hledat schůzky"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_ir_attachment
@@ -1366,6 +1376,13 @@ msgid ""
 "              </p>\n"
 "            "
 msgstr ""
+"<p class=\"oe_view_nocontent_create\">\n"
+"                Klepni zde pro nastavení nového druhu upozornění.\n"
+"              </p><p>\n"
+"                Můžete vytvořit své upozornění, které pak můžete\n"
+"                použít pro události nebo schůzky v kalendáři.\n"
+"              </p>\n"
+"            "
 
 #. module: base_calendar
 #: selection:crm.meeting,state:0
@@ -1416,6 +1433,7 @@ msgid ""
 "Contains the text to be                      used as the message subject for "
 "email                      or contains the text to be used for display"
 msgstr ""
+"Obsahuje text, který bude použit jako předmět e-mailu nebo pro zobrazení"
 
 #. module: base_calendar
 #: model:ir.model,name:base_calendar.model_mail_message
diff --git a/addons/base_import/i18n/hr.po b/addons/base_import/i18n/hr.po
index cb21df6c88b..c4d23e2020b 100644
--- a/addons/base_import/i18n/hr.po
+++ b/addons/base_import/i18n/hr.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:05+0000\n"
-"PO-Revision-Date: 2012-12-21 23:00+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2013-02-13 22:57+0000\n"
+"Last-Translator: Davor Bojkić <bole@dajmi5.com>\n"
 "Language-Team: Croatian <hr@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-01-18 06:36+0000\n"
-"X-Generator: Launchpad (build 16430)\n"
+"X-Launchpad-Export-Date: 2013-02-14 05:36+0000\n"
+"X-Generator: Launchpad (build 16491)\n"
 
 #. module: base_import
 #. openerp-web
@@ -29,7 +29,7 @@ msgstr "Dohvati sve moguće vrijednosti"
 #: code:addons/base_import/static/src/xml/import.xml:71
 #, python-format
 msgid "Need to import data from an other application?"
-msgstr ""
+msgstr "Potreban je uvoz podataka iz druge aplikacije?"
 
 #. module: base_import
 #. openerp-web
@@ -47,6 +47,15 @@ msgid ""
 "give \n"
 "                        you an example for Products and their Categories."
 msgstr ""
+"Kada koristite vanjske ID-eve, možete uvesti csv datoteke \n"
+"                                               sa kolonom \"External ID\" "
+"definirate vanjski ID svakog zapisa \n"
+"                                               koji uvozite. Tada ćete biti "
+"u mogućnosti napraviti referencu \n"
+"                                              na taj zapis sa kolonama tipa "
+"\"polje/External ID\". Sljedeća dvije \n"
+"                                              csv datoteke daju primjer za "
+"proizvode i njihove kategorije."
 
 #. module: base_import
 #. openerp-web
@@ -56,13 +65,16 @@ msgid ""
 "How to export/import different tables from an SQL \n"
 "                        application to OpenERP?"
 msgstr ""
+"Kako izvesti/uvesti različite tablice iz SQL \n"
+"                                                                             "
+"programa u OpenERP"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:310
 #, python-format
 msgid "Relation Fields"
-msgstr ""
+msgstr "Relacijska polja"
 
 #. module: base_import
 #. openerp-web
@@ -72,6 +84,9 @@ msgid ""
 "Country/Database ID: the unique OpenERP ID for a \n"
 "                        record, defined by the ID postgresql column"
 msgstr ""
+"Država/ID baze: jedinstveni OpenERP ID za  \n"
+"                                                                             "
+"   zapis, definran kolonom postgres kolonom ID"
 
 #. module: base_import
 #. openerp-web
@@ -87,6 +102,16 @@ msgid ""
 "\n"
 "                        have a unique Database ID)"
 msgstr ""
+"Korištenje \n"
+"                                                                Država/ID "
+"BAze : ovo bi trebali rijetko koristiti\n"
+"                                                                za "
+"označavanje. Ovo je većinom korišteno od strane programera\n"
+"                                                                jer je "
+"glavna prednost ovoga to što nikad nema konflikata \n"
+"                                                                (možete "
+"imati više zapisa istog naziva, ali uvjek sa jedinstvenim IDentifikatorom u "
+"Bazi)"
 
 #. module: base_import
 #. openerp-web
@@ -96,6 +121,9 @@ msgid ""
 "For the country \n"
 "                        Belgium, you can use one of these 3 ways to import:"
 msgstr ""
+"Za državu \n"
+"                                                                             "
+" Belgiju, možete koristiti jedan od ova 3 načina uza uvoz:"
 
 #. module: base_import
 #. openerp-web
@@ -121,13 +149,20 @@ msgid ""
 "companies) TO \n"
 "                        '/tmp/company.csv' with CSV HEADER;"
 msgstr ""
+"kopirajte \n"
+"                                                                    (select "
+"'company_'||id as \"External ID\",company_name\n"
+"                                                                    as "
+"\"Name\",'True' as \"Is a Company\" from companies) TO\n"
+"                                                                     "
+"'/tmp/company.csv' with CSV HEADER;"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:206
 #, python-format
 msgid "CSV file for Manufacturer, Retailer"
-msgstr ""
+msgstr "CSV datoteka za Proizvođače, Veletrgovce"
 
 #. module: base_import
 #. openerp-web
@@ -139,6 +174,11 @@ msgid ""
 "\n"
 "                        data from a third party application."
 msgstr ""
+"Koristi \n"
+"                                                      Država/Vanjski ID. "
+"koristite vanjski ID kad uvozite \n"
+"                                                       podatke iz drugih "
+"aplikacija."
 
 #. module: base_import
 #. openerp-web
@@ -152,7 +192,7 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:80
 #, python-format
 msgid "XXX/External ID"
-msgstr ""
+msgstr "XXX/Vanjski ID"
 
 #. module: base_import
 #. openerp-web
@@ -181,6 +221,14 @@ msgid ""
 "\n"
 "                        See the following question."
 msgstr ""
+"Primjetite da vaša csv datoteka \n"
+"                                                   ima tabulator za "
+"odvajanje, a OpenERP neće \n"
+"                                                   primjetiti ta odvajanja. "
+"Morate promjineiti format \n"
+"                                                   zapisa u vašem tabličnom "
+"kalkulatoru. \n"
+"                                                   Vidi sljedeće pitanje."
 
 #. module: base_import
 #. openerp-web
@@ -199,7 +247,7 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:239
 #, python-format
 msgid "Can I import several times the same record?"
-msgstr ""
+msgstr "Mogu li isti zapis uvesti nekoliko puta?"
 
 #. module: base_import
 #. openerp-web
@@ -213,7 +261,7 @@ msgstr "Potvrdi"
 #: code:addons/base_import/static/src/xml/import.xml:55
 #, python-format
 msgid "Map your data to OpenERP"
-msgstr ""
+msgstr "Mapirajte vaše podatke na OpenERP"
 
 #. module: base_import
 #. openerp-web
@@ -224,6 +272,10 @@ msgid ""
 "                        the easiest way when your data come from CSV files \n"
 "                        that have been created manually."
 msgstr ""
+"Korištenje Države: ovo je  \n"
+"                                                  najlakši način kada vaši "
+"podaci dolaze iz csv datoteka\n"
+"                                                  koje su sastavljene ručno."
 
 #. module: base_import
 #. openerp-web
@@ -233,6 +285,8 @@ msgid ""
 "What's the difference between Database ID and \n"
 "                        External ID?"
 msgstr ""
+"Koja je razlika izmeži ID Baze i \n"
+"                                                           vanjski ID?"
 
 #. module: base_import
 #. openerp-web
@@ -244,25 +298,30 @@ msgid ""
 "\n"
 "                        you 3 different fields to import:"
 msgstr ""
+"Na primjer, \n"
+"                                                      referenciranje države "
+"kontakta, OpenERP predlaže \n"
+"                                                      3 različita polja za "
+"uvoz :"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:175
 #, python-format
 msgid "What can I do if I have multiple matches for a field?"
-msgstr ""
+msgstr "Što da radim ako imam više istih zapisa za polje?"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:302
 #, python-format
 msgid "External ID,Name,Is a Company"
-msgstr ""
+msgstr "Vanjski ID , Naziv, Je Tvrtka"
 
 #. module: base_import
 #: field:base_import.tests.models.preview,somevalue:0
 msgid "Some Value"
-msgstr ""
+msgstr "Neka vrijednost"
 
 #. module: base_import
 #. openerp-web
@@ -272,6 +331,9 @@ msgid ""
 "The following CSV file shows how to import \n"
 "                        suppliers and their respective contacts"
 msgstr ""
+"Sljedeća csv datoteka pokazuje kako uvesti \n"
+"                                                                             "
+"   dobavljače i njihove pripadne kontakte"
 
 #. module: base_import
 #. openerp-web
@@ -281,6 +343,9 @@ msgid ""
 "How can I change the CSV file format options when \n"
 "                        saving in my spreadsheet application?"
 msgstr ""
+"Kako da promijenim opcije csv formata \n"
+"                                                                         "
+"kada spremam datoteku u tabličnom kalkulatoru?"
 
 #. module: base_import
 #. openerp-web
@@ -301,6 +366,21 @@ msgid ""
 "orignial \n"
 "                        database)."
 msgstr ""
+"kako možete vidjeti iz ove datoteke, Fabien i Laurence \n"
+"                                                                             "
+"                        rade za organizaciju Biggies (company_1), a \n"
+"                                                                             "
+"                        Eric radi za Organi. Pozezivanje osoba i "
+"organizacija se radi \n"
+"                                                                             "
+"                        korištenjem Vanjskog ID-a organizacije. Morali smo "
+"staviti prefix \n"
+"                                                                             "
+"                        naziva tablice na Vanjski ID da izbjegnemo konflikt "
+"istog ID-a osobe \n"
+"                                                                             "
+"                        i organizacije (osoba_1 i organizacija_1 koji dijele "
+"isti ID u originalnoj bazi)."
 
 #. module: base_import
 #. openerp-web
@@ -315,13 +395,20 @@ msgid ""
 "\n"
 "                        '/tmp/person.csv' with CSV"
 msgstr ""
+"kopirajte \n"
+"                       (select'person_'||id as \"External ID\",person_name "
+"as\n"
+"                       \"Name\",'False' as \"Is a "
+"Company\",'company_'||company_id\n"
+"                       as \"Related Company/External ID\" from persons) TO\n"
+"                        '/tmp/person.csv' with CSV"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:148
 #, python-format
 msgid "Country: Belgium"
-msgstr ""
+msgstr "Država : Belgija"
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char_stillreadonly
@@ -342,7 +429,7 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:233
 #, python-format
 msgid "Suppliers and their respective contacts"
-msgstr ""
+msgstr "Dobavljači i njihovi pripadni kontakti"
 
 #. module: base_import
 #. openerp-web
@@ -364,6 +451,23 @@ msgid ""
 "category \n"
 "                        hierarchy."
 msgstr ""
+"Ako na primjer imate dvije kategorije proizvoda \n"
+"                                                                             "
+"     sa podređenim nazivom \"za prodaju\" (npr. \"razno/proizvodi /za "
+"prodaju\"\n"
+"                                                                             "
+"     i \"ostali proizvodi/za prodaju\" vaša validacija je zadržana, ali još "
+"uvijek možete\n"
+"                                                                             "
+"     uvesti vaše podatke. Pazite, ne preporučamo vam da uvozite podatke jer\n"
+"                                                                             "
+"     će oni biti povezani na prvu kategoriju \"za prodaju\" pronađenu u "
+"popisu \n"
+"                                                                             "
+"     kategorija (\"razno/proizvodi/za prodaju\"). Preporučamo Vam da "
+"izmjenite \n"
+"                                                                             "
+"     jednu od dvostrukih vrijednosti ili hijerarhiju vaših kategorija."
 
 #. module: base_import
 #. openerp-web
@@ -375,6 +479,11 @@ msgid ""
 "\n"
 "                        PSQL:"
 msgstr ""
+"Za stvaranje csv datoteke za osobe povezane sa \n"
+"                                                                             "
+"   organizacijama, koristimo ljedeću SQL naredbu u \n"
+"                                                                             "
+"   PSQL:"
 
 #. module: base_import
 #. openerp-web
@@ -386,6 +495,13 @@ msgid ""
 "                        (in 'Save As' dialog box > click 'Tools' dropdown \n"
 "                        list > Encoding tab)."
 msgstr ""
+"Microsoft Excell će vam omogućiti \n"
+"                                                da promjenite kodnu stranu "
+"jedino kod snimanja \n"
+"                                                 (U 'Save as' dijalogu > "
+"kliknite na 'Tools' padajući izbornik > \n"
+"                                                 odaberite 'Encoding' "
+"karticu)"
 
 #. module: base_import
 #: field:base_import.tests.models.preview,othervalue:0
@@ -402,6 +518,13 @@ msgid ""
 "                        later, it's thus good practice to specify it\n"
 "                        whenever possible"
 msgstr ""
+"će također biti korišteno za ažuriranje originalnog \n"
+"                                                                            "
+"uvoza, ako kasnije trebate ponovo uvesti \n"
+"                                                                            "
+"izmjenjene podatke, zato se smatra dobrom praksom \n"
+"                                                                            "
+"koristiti kad god je moguće"
 
 #. module: base_import
 #. openerp-web
@@ -411,6 +534,9 @@ msgid ""
 "file to import. If you need a sample importable file, you\n"
 "            can use the export tool to generate one."
 msgstr ""
+"datoteka za uvoz. Ako trebate uzorak datoteke koja se može uvesti,\n"
+"                                                            možete koristiti "
+"alat za izvoz da napravite jednu."
 
 #. module: base_import
 #. openerp-web
@@ -419,7 +545,7 @@ msgstr ""
 msgid ""
 "Country/Database \n"
 "                        ID: 21"
-msgstr ""
+msgstr "Država/Baza"
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_char
@@ -429,14 +555,14 @@ msgstr ""
 #. module: base_import
 #: help:base_import.import,file:0
 msgid "File to check and/or import, raw binary (not base64)"
-msgstr ""
+msgstr "Datoteke za provjeru i/ili uvoz, raw binary ( ne base64)"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:230
 #, python-format
 msgid "Purchase orders with their respective purchase order lines"
-msgstr ""
+msgstr "Narudžbe i njihove pripadne stavke"
 
 #. module: base_import
 #. openerp-web
@@ -448,6 +574,14 @@ msgid ""
 "                field corresponding to the column. This makes imports\n"
 "                simpler especially when the file has many columns."
 msgstr ""
+"Ako datoteka sadrži\n"
+"                                          nazive kolona, OpenERP može "
+"pokušati \n"
+"                                          automatski odrediti polja koja "
+"odgovaraju kolonama. \n"
+"                                          Ovo čini uvoz jednostavnijim "
+"pogotovo ako datoteka ima \n"
+"                                         mnogo kolona."
 
 #. module: base_import
 #. openerp-web
@@ -464,6 +598,8 @@ msgid ""
 ". The issue is\n"
 "            usually an incorrect file encoding."
 msgstr ""
+". Problem je \n"
+"                                obično netočna kodna strana."
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required
@@ -490,6 +626,19 @@ msgid ""
 "filter \n"
 "                        settings' > Save)."
 msgstr ""
+"Ako uređujete i premate CSV datoteku u tabličnom kalkulatoru \n"
+"                                                                             "
+"            vaše regionalne postavke sa računala će biti\n"
+"                                                                             "
+"            primjenjene na separatore i odvajanja. \n"
+"                                                                             "
+"            Preporučamo da koristite OpenOffice ili LibreOffice kalkulator\n"
+"                                                                             "
+"            jer vam oni omogućuju izmjene sve tri postavke\n"
+"                                                                             "
+"            (u 'Spremi kao' dijalogu > označite 'uredi postavke filtera' \n"
+"                                                                             "
+"            > Spremi)"
 
 #. module: base_import
 #. openerp-web
@@ -519,7 +668,7 @@ msgstr "ID baze podataka"
 #: code:addons/base_import/static/src/xml/import.xml:313
 #, python-format
 msgid "It will produce the following CSV file:"
-msgstr ""
+msgstr "Će napraviti sljedeću csv datoteku:"
 
 #. module: base_import
 #. openerp-web
@@ -548,7 +697,7 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:360
 #, python-format
 msgid "Import preview failed due to:"
-msgstr ""
+msgstr "Predpregled uvoza nije uspio zbog:"
 
 #. module: base_import
 #. openerp-web
@@ -560,6 +709,11 @@ msgid ""
 "\n"
 "                        that imported it)"
 msgstr ""
+"Područje/Vanjski ID : ID ovog zapisa \n"
+"                                                                      je "
+"referenciran u drugoj aplikaciji (ili XML datoteci \n"
+"                                                                      iz "
+"koje je uvezen)"
 
 #. module: base_import
 #. openerp-web
@@ -588,6 +742,19 @@ msgid ""
 "\n"
 "                        per field you want to import."
 msgstr ""
+"Neka polja definiraju poveznice sa drugim \n"
+"                                                                             "
+" objektima. na primjer, područje kontakta je veza \n"
+"                                                                             "
+" na zapis objekta 'područje'. Kada ćelite uvesti ovakva polja, \n"
+"                                                                             "
+" OpenERP će ponovo stvoriti veze između različitih zapisa.\n"
+"                                                                             "
+" Da bi vam pomogao uvesti takva polja, OpenERP pruža 3 \n"
+"                                                                             "
+" mehanizma. Možete koristiti jedan i samo jedan mehanizam \n"
+"                                                                             "
+" po polju koje želite uvesti."
 
 #. module: base_import
 #. openerp-web
@@ -601,6 +768,13 @@ msgid ""
 "                        then you will encode it as follow \"Manufacturer,\n"
 "                        Retailer\" in the same column of your CSV file."
 msgstr ""
+"Podaci bi trebali biti odvojeni sa zarezima bez ikakvih \n"
+"                                                                             "
+"         razmaka. Na primjer. ako želite da vaš partner bude \n"
+"                                                                             "
+"         označen kao 'kupac' i kao 'dobavljač' tada u vačem CSV-u \n"
+"                                                                             "
+"         unosite \"kupac, dobavljač\" u istoj koloni."
 
 #. module: base_import
 #: code:addons/base_import/models.py:264
@@ -643,7 +817,7 @@ msgstr "Uvezi CSV datoteku"
 #: code:addons/base_import/static/src/js/import.js:74
 #, python-format
 msgid "Quoting:"
-msgstr ""
+msgstr "Navođenje:"
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_m2o_required_related
@@ -670,7 +844,7 @@ msgstr "Uvoz"
 #: code:addons/base_import/static/src/js/import.js:407
 #, python-format
 msgid "Here are the possible values:"
-msgstr ""
+msgstr "Evo mogućih vrijednosti:"
 
 #. module: base_import
 #. openerp-web
@@ -687,13 +861,15 @@ msgid ""
 "A single column was found in the file, this often means the file separator "
 "is incorrect"
 msgstr ""
+"U datoteci je nađena samo jedna kolona, to često znači da je format "
+"razdjelnika neispravan."
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:293
 #, python-format
 msgid "dump of such a PostgreSQL database"
-msgstr ""
+msgstr "dump takve PostgereSQL baze"
 
 #. module: base_import
 #. openerp-web
@@ -710,6 +886,9 @@ msgid ""
 "The following CSV file shows how to import purchase \n"
 "                        orders with their respective purchase order lines:"
 msgstr ""
+"Sljedeća csv datoteka pokazuje kako uvesti \n"
+"                                                    naloge za nabavu sa "
+"njihovm pripadnim stavkama :"
 
 #. module: base_import
 #. openerp-web
@@ -719,6 +898,9 @@ msgid ""
 "What can I do when the Import preview table isn't \n"
 "                        displayed correctly?"
 msgstr ""
+"Što mogu uraditi kada  se tablice Predpregleda za uvoz\n"
+"                                                                             "
+"      ne prikazuju ispravno?"
 
 #. module: base_import
 #: field:base_import.tests.models.char,value:0
@@ -749,7 +931,7 @@ msgstr ""
 #: code:addons/base_import/static/src/xml/import.xml:149
 #, python-format
 msgid "Country/External ID: base.be"
-msgstr ""
+msgstr "Područje/Vanjski ID : base.be"
 
 #. module: base_import
 #. openerp-web
@@ -764,20 +946,29 @@ msgid ""
 "                        the company he work for. (If you want to test this \n"
 "                        example, here is a"
 msgstr ""
+"Kao primjer, pretpostavimo da imate SQL bazu \n"
+"                                                                             "
+"       sa dvije tablice koje želite uvesti: tvrtke i \n"
+"                                                                             "
+"       osobe. Svaka osoba pripada jednoj tvrtci, tako da \n"
+"                                                                             "
+"       ćete morati ponovo stvoriti poveznicu između osobe \n"
+"                                                                             "
+"       i tvrtke za koju radi. (Ako želite probati ovaj primjer, ovdje je"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:396
 #, python-format
 msgid "(%d more)"
-msgstr ""
+msgstr "(%d više)"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:227
 #, python-format
 msgid "File for some Quotations"
-msgstr ""
+msgstr "Dadoteka sa nekim ponudama"
 
 #. module: base_import
 #. openerp-web
@@ -804,6 +995,19 @@ msgid ""
 "\n"
 "                        table. (like 'company_1', 'person_1' instead of '1')"
 msgstr ""
+"Za upravljanje relacijama između tablica, \n"
+"                                                                         "
+"možete koristiti \"Vanjski ID\"  mogućnosti OpenERP-a. \n"
+"                                                                         "
+"\"Vanjski ID\" zapisa je jedinstveni identifikator ovog zapisa\n"
+"                                                                         u "
+"drugoj aplikaciji. Ovaj \"Vanjski ID\" mora biti jedinstven u\n"
+"                                                                         u "
+"svim zapisima i svim objektima, pa je uobičajena dobra praksa\n"
+"                                                                         "
+"dati prefiks tom \"Vanjskom ID\" po nazivu aplikacije ili tablice. \n"
+"                                                                         "
+"(npr. 'company_1', 'osoba_1' umjesto '1')"
 
 #. module: base_import
 #. openerp-web
@@ -814,6 +1018,9 @@ msgid ""
 "                        \"External ID\". In PSQL, write the following "
 "command:"
 msgstr ""
+"Prvo ćemo izvesti ave organizacije i njihove \n"
+"                                                                             "
+" \"Vanjske ID\". U PSQL, napišite sljedeću narebu:"
 
 #. module: base_import
 #. openerp-web
@@ -823,13 +1030,16 @@ msgid ""
 "How can I import a one2many relationship (e.g. several \n"
 "                        Order Lines of a Sales Order)?"
 msgstr ""
+"Kako da uvezem one2many relaciju (npr. nekoliko \n"
+"                                                                             "
+"               stavki prodajnog maloga)?"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:373
 #, python-format
 msgid "Everything seems valid."
-msgstr ""
+msgstr "Sve se čini u redu."
 
 #. module: base_import
 #. openerp-web
@@ -842,6 +1052,13 @@ msgid ""
 "                        use make use of the external ID for this field \n"
 "                        'Category'."
 msgstr ""
+"Međutim ukoliko ne želite mijenjati vaše \n"
+"                                                                       "
+"postavke kategorija proizvoda, preporučamo vam da \n"
+"                                                                       "
+"koristite vanjski ID za ovo polje \n"
+"                                                                       "
+"'Kagtegorija'."
 
 #. module: base_import
 #. openerp-web
@@ -858,6 +1075,9 @@ msgid ""
 "How can I import a many2many relationship field \n"
 "                        (e.g. a customer that has multiple tags)?"
 msgstr ""
+"Kako mogu uvesti many2many relacijsko polje \n"
+"                                                                             "
+"      (npr, kupac koji ima višestruke oznake)?"
 
 #. module: base_import
 #. openerp-web
@@ -880,6 +1100,15 @@ msgid ""
 "                        link between each person and the company they work \n"
 "                        for)."
 msgstr ""
+"Ako trebate uvesti podatke iz različitih tablica, \n"
+"                                                                             "
+"       morate ponovo kreirati relacije između zapisa \n"
+"                                                                             "
+"       koji pripadaju različitim tablicama. (npr. ako uvozite\n"
+"                                                                             "
+"       organizacije i osobe, morate ponovo kreirati poveznicu\n"
+"                                                                             "
+"       između između svake osobe i organizacije za koju osoba radi)."
 
 #. module: base_import
 #. openerp-web
@@ -892,6 +1121,13 @@ msgid ""
 "                        Here is when you should use one or the other, \n"
 "                        according to your need:"
 msgstr ""
+"Sukladno vačim potrebama trebali bi koristiti \n"
+"                                                                           "
+"jedan od 3 načina referenciranja zapisa u relacijama.\n"
+"                                                                           "
+"Ovdje trebate koristiti jedan raspoloživih prema, \n"
+"                                                                           "
+"vačim potrebama :"
 
 #. module: base_import
 #. openerp-web
@@ -914,6 +1150,15 @@ msgid ""
 "                        will set the EMPTY value in the field, instead of \n"
 "                        assigning the default value."
 msgstr ""
+"Ako ne postavite sva polja u vašoj csv datoteci, \n"
+"                                                            OpenERP će "
+"dodijeliti zadane vrijednosti za svako \n"
+"                                                            nedefinirano "
+"polje, ali ako postavite polja sa praznim virjenostima u csv-u \n"
+"                                                            OpenERP će "
+"postaviti vrijednost tih polja na \"PRAZNO\", umjesto da im \n"
+"                                                            dodijeli zadane "
+"vrijednosti"
 
 #. module: base_import
 #. openerp-web
@@ -930,6 +1175,9 @@ msgid ""
 "What happens if I do not provide a value for a \n"
 "                        specific field?"
 msgstr ""
+"Što se dešava ako ne dajem vrijednost za \n"
+"                                                                         "
+"pojedino polje?"
 
 #. module: base_import
 #. openerp-web
@@ -957,6 +1205,11 @@ msgid ""
 "spreadsheet \n"
 "                        application."
 msgstr ""
+"Ovo vam \n"
+"                                                           omogućuje da "
+"koristite alat za Uvoz/Izvoz OpenERP-a \n"
+"                                                           za izmjenu serija "
+"zapisa u vašem omiljenom tabličnom kalkulatoru"
 
 #. module: base_import
 #. openerp-web
@@ -967,6 +1220,10 @@ msgid ""
 "                        import an other record that links to the first\n"
 "                        one, use"
 msgstr ""
+"kolona u OpenERP-u. Kada \n"
+"                                                     uvozite drugi zapis "
+"koji se referencira na prvi\n"
+"                                                     koristite"
 
 #. module: base_import
 #. openerp-web
@@ -987,20 +1244,33 @@ msgid ""
 "                        take care of creating or modifying each record \n"
 "                        depending if it's new or not."
 msgstr ""
+"Ako uvozite datoteku koja sadži jednu od \n"
+"                                                                          "
+"kolona \"Vanjski ID\" ili \"ID Baze\", zapisi koje ste već\n"
+"                                                                          "
+"uvezli će biti izmjenjeni umjesto stvoreni. Ovo je \n"
+"                                                                           "
+"veoma korisno i dozvoljava vam da uvozite nekoliko puta \n"
+"                                                                           "
+"istu CSV datoteku, upisujući neke izmjene između dva\n"
+"                                                                           "
+"uvoza. OpenERP će se pobrinuti o stvaranju ili izmjeni \n"
+"                                                                           "
+"svakog zapisa ovisno o tome da li je novi ili postojeći."
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/xml/import.xml:169
 #, python-format
 msgid "CSV file for categories"
-msgstr ""
+msgstr "CSV datoteka za kategorije"
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:309
 #, python-format
 msgid "Normal Fields"
-msgstr ""
+msgstr "Normalna polja"
 
 #. module: base_import
 #. openerp-web
@@ -1012,6 +1282,11 @@ msgid ""
 "                        identifier from the original application and\n"
 "                        map it to the"
 msgstr ""
+"kako bi ponovo napravili relacije između\n"
+"                                                                         "
+"različitih zapisa, trebali bi koristiti jedinstveni\n"
+"                                                                         "
+"identifikator iz originalnog zapisa i njega mapirati na"
 
 #. module: base_import
 #. openerp-web
@@ -1038,6 +1313,19 @@ msgid ""
 "\n"
 "                        the fields relative to the order."
 msgstr ""
+"Ako želite uvesti prodajne naloge koji sadrže nekoliko \n"
+"                                                                             "
+"      stavki, za svaku stavku morate rezervirati\n"
+"                                                                             "
+"      njezin red u CSV datoteci. Prva stavka naloga \n"
+"                                                                             "
+"      će biti uvezena ako informacija vezana za taj \n"
+"                                                                             "
+"      nalog. Svaka dodatna stavka će trebati svoj\n"
+"                                                                             "
+"      dodatni red koji nema nikakve podatke u poljima\n"
+"                                                                             "
+"      vezanim za taj nalog."
 
 #. module: base_import
 #: model:ir.model,name:base_import.model_base_import_tests_models_m2o_related
@@ -1054,7 +1342,7 @@ msgstr "Naziv"
 #: code:addons/base_import/static/src/xml/import.xml:80
 #, python-format
 msgid "to the original unique identifier."
-msgstr ""
+msgstr "originalni jedinstveni identifikator"
 
 #. module: base_import
 #. openerp-web
@@ -1090,6 +1378,17 @@ msgid ""
 "                        to the first company). You must first import the \n"
 "                        companies and then the persons."
 msgstr ""
+"Dvije dobivene datoteke su spremne da budu uvežene u \n"
+"                                                                             "
+"                       OpenERP bez ikakvih izmjena. Nakon uvoza\n"
+"                                                                             "
+"                       ove dvije CSV datoteke, imaćete 4 kontakta \n"
+"                                                                             "
+"                       i 3 organizacije. (prva dva kontakta su povezana na\n"
+"                                                                             "
+"                       prvu organizaciju). Prvo morate uvesti organizacije\n"
+"                                                                             "
+"                       a potom kontakte."
 
 #. module: base_import
 #. openerp-web
@@ -1103,6 +1402,15 @@ msgid ""
 "                        (displayed under the Browse CSV file bar after you \n"
 "                        select your file)."
 msgstr ""
+"Zadane postavke predpogleda za uvoz su zarezi \n"
+"                                                                             "
+"         za razdvajanje polja, i navodnici kao oznaka teksta. \n"
+"                                                                             "
+"         Ako vaša CSV datoteka nema ove postavke, možete ih \n"
+"                                                                             "
+"          izmjeniti u Opcijama postavki formata. (prikazanim u traci\n"
+"                                                                             "
+"          Potraži CSV datoteku nakon što odaberete jednu)."
 
 #. module: base_import
 #. openerp-web
@@ -1131,14 +1439,14 @@ msgstr "Vanjski ID"
 #: code:addons/base_import/static/src/xml/import.xml:39
 #, python-format
 msgid "File Format Options…"
-msgstr ""
+msgstr "Opcije Formata datoteka..."
 
 #. module: base_import
 #. openerp-web
 #: code:addons/base_import/static/src/js/import.js:392
 #, python-format
 msgid "between rows %d and %d"
-msgstr ""
+msgstr "između reda %d i %d"
 
 #. module: base_import
 #. openerp-web
@@ -1163,4 +1471,4 @@ msgstr ""
 #. module: base_import
 #: field:base_import.import,file:0
 msgid "File"
-msgstr ""
+msgstr "Datoteka"
diff --git a/addons/email_template/tests/test_mail.py b/addons/email_template/tests/test_mail.py
index 2ee8bf10297..b87b6d63000 100644
--- a/addons/email_template/tests/test_mail.py
+++ b/addons/email_template/tests/test_mail.py
@@ -45,8 +45,8 @@ class test_message_compose(TestMailBase):
         # Mail data
         _subject1 = 'Pigs'
         _subject2 = 'Bird'
-        _body_html1 = '<div><p>Fans of Pigs, unite !\n</p><p>Admin</p></div>'
-        _body_html2 = '<div><p>I am angry !\n</p><p>Admin</p></div>'
+        _body_html1 = 'Fans of Pigs, unite !'
+        _body_html2 = 'I am angry !'
         _attachments = [
             {'name': 'First', 'datas_fname': 'first.txt', 'datas': base64.b64encode('My first attachment')},
             {'name': 'Second', 'datas_fname': 'second.txt', 'datas': base64.b64encode('My second attachment')}
@@ -113,7 +113,7 @@ class test_message_compose(TestMailBase):
         partner_ids = self.res_partner.search(cr, uid, [('email', 'in', ['b@b.b', 'c@c.c', 'd@d.d'])])
         # Test: mail.compose.message: subject, body, partner_ids
         self.assertEqual(compose.subject, _subject1, 'mail.compose.message subject incorrect')
-        self.assertEqual(compose.body, _body_html1, 'mail.compose.message body incorrect')
+        self.assertIn(_body_html1, compose.body, 'mail.compose.message body incorrect')
         self.assertEqual(set(message_pids), set(partner_ids), 'mail.compose.message partner_ids incorrect')
         # Test: mail.compose.message: attachments
         # Test: mail.message: attachments
@@ -159,8 +159,8 @@ class test_message_compose(TestMailBase):
         # Test: subject, body
         self.assertEqual(message_pigs.subject, _subject1, 'mail.message subject on Pigs incorrect')
         self.assertEqual(message_bird.subject, _subject2, 'mail.message subject on Bird incorrect')
-        self.assertEqual(message_pigs.body, _body_html1, 'mail.message body on Pigs incorrect')
-        self.assertEqual(message_bird.body, _body_html2, 'mail.message body on Bird incorrect')
+        self.assertIn(_body_html1, message_pigs.body, 'mail.message body on Pigs incorrect')
+        self.assertIn(_body_html2, message_bird.body, 'mail.message body on Bird incorrect')
         # Test: partner_ids: p_a_id (default) + 3 newly created partners
         message_pigs_pids = [partner.id for partner in message_pigs.notified_partner_ids]
         message_bird_pids = [partner.id for partner in message_bird.notified_partner_ids]
diff --git a/addons/email_template/wizard/mail_compose_message.py b/addons/email_template/wizard/mail_compose_message.py
index ad30b3817f5..b39ed4e5639 100644
--- a/addons/email_template/wizard/mail_compose_message.py
+++ b/addons/email_template/wizard/mail_compose_message.py
@@ -150,8 +150,8 @@ class mail_compose_message(osv.TransientModel):
             values = {}
         # get values to return
         email_dict = super(mail_compose_message, self).render_message(cr, uid, wizard, res_id, context)
-        email_dict.update(values)
-        return email_dict
+        values.update(email_dict)
+        return values
 
     def render_template(self, cr, uid, template, model, res_id, context=None):
         return self.pool.get('email.template').render_template(cr, uid, template, model, res_id, context=context)
diff --git a/addons/mail/mail_mail.py b/addons/mail/mail_mail.py
index eb5ec30496e..1b3ca152a9a 100644
--- a/addons/mail/mail_mail.py
+++ b/addons/mail/mail_mail.py
@@ -157,7 +157,7 @@ class mail_mail(osv.Model):
             :param browse_record partner: specific recipient partner
         """
         if force or (not mail.subject and mail.model and mail.res_id):
-            return '%s posted on %s' % (mail.author_id.name, mail.record_name)
+            return 'Re: %s' % (mail.record_name)
         return mail.subject
 
     def send_get_mail_body(self, cr, uid, mail, partner=None, context=None):
diff --git a/addons/mail/mail_thread.py b/addons/mail/mail_thread.py
index 7a2be4aed01..46052b07fdf 100644
--- a/addons/mail/mail_thread.py
+++ b/addons/mail/mail_thread.py
@@ -961,13 +961,12 @@ class mail_thread(osv.AbstractModel):
         mail_message_obj = self.pool.get('mail.message')
         ir_attachment = self.pool.get('ir.attachment')
 
-        # 1.A.1: add recipients of parent message
+        # 1.A.1: add recipients of parent message (# TDE FIXME HACK: mail.thread -> private message)
         partner_ids = set([])
-        if parent_id:
+        if parent_id and self._name == 'mail.thread':
             parent_message = mail_message_obj.browse(cr, uid, parent_id, context=context)
             partner_ids |= set([(4, partner.id) for partner in parent_message.partner_ids])
-            # TDE FIXME HACK: mail.thread -> private message
-            if self._name == 'mail.thread' and parent_message.author_id.id:
+            if parent_message.author_id.id:
                 partner_ids.add((4, parent_message.author_id.id))
 
         # 1.A.2: add specified recipients
diff --git a/addons/mail/tests/test_mail_features.py b/addons/mail/tests/test_mail_features.py
index e4e4c1a19b4..4302dab8669 100644
--- a/addons/mail/tests/test_mail_features.py
+++ b/addons/mail/tests/test_mail_features.py
@@ -339,7 +339,7 @@ class test_mail(TestMailBase):
 
         # Mail data
         _subject = 'Pigs'
-        _mail_subject = '%s posted on %s' % (user_raoul.name, group_pigs.name)
+        _mail_subject = 'Re: %s' % (group_pigs.name)
         _body1 = '<p>Pigs rules</p>'
         _mail_body1 = '<p>Pigs rules</p>\n<div><p>Raoul</p></div>\n'
         _mail_bodyalt1 = 'Pigs rules\nRaoul\n'
diff --git a/addons/procurement/i18n/mn.po b/addons/procurement/i18n/mn.po
index c88ed5041b2..06ac63d6e03 100644
--- a/addons/procurement/i18n/mn.po
+++ b/addons/procurement/i18n/mn.po
@@ -14,13 +14,13 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2013-02-14 05:36+0000\n"
 "X-Generator: Launchpad (build 16491)\n"
 
 #. module: procurement
 #: model:ir.ui.menu,name:procurement.menu_stock_sched
 msgid "Schedulers"
-msgstr "Төлөвлөгч"
+msgstr "Товлогч"
 
 #. module: procurement
 #: model:ir.model,name:procurement.model_make_procurement
diff --git a/addons/stock/i18n/mn.po b/addons/stock/i18n/mn.po
index b42839648c0..b1c07b7f198 100644
--- a/addons/stock/i18n/mn.po
+++ b/addons/stock/i18n/mn.po
@@ -8,13 +8,13 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
-"PO-Revision-Date: 2013-02-13 04:17+0000\n"
+"PO-Revision-Date: 2013-02-14 03:59+0000\n"
 "Last-Translator: gobi <Unknown>\n"
 "Language-Team: Mongolian <mn@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-02-13 05:21+0000\n"
+"X-Launchpad-Export-Date: 2013-02-14 05:36+0000\n"
 "X-Generator: Launchpad (build 16491)\n"
 
 #. module: stock
@@ -88,7 +88,7 @@ msgstr "Сөрөг урсгалыг Хөтлөх боломж"
 #: field:stock.picking.in,date_done:0
 #: field:stock.picking.out,date_done:0
 msgid "Date of Transfer"
-msgstr ""
+msgstr "Шилжүүлэх огноо"
 
 #. module: stock
 #: field:product.product,track_outgoing:0
@@ -160,7 +160,7 @@ msgstr "Тоо хэмжээ сөрөг байж болохгүй."
 #: view:stock.picking:0
 #: view:stock.picking.in:0
 msgid "Picking list"
-msgstr "Агуулахын баримт"
+msgstr "Бэлтгэх Жагсаалт"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -319,7 +319,7 @@ msgstr "Боловсруулах Бараанууд"
 #. module: stock
 #: view:stock.move:0
 msgid "New Pack"
-msgstr ""
+msgstr "Шинэ ачаа"
 
 #. module: stock
 #: help:stock.fill.inventory,set_stock_zero:0
@@ -472,7 +472,7 @@ msgstr "Хоцролт (Өдөрөөр)"
 #. module: stock
 #: selection:stock.picking.out,state:0
 msgid "Ready to Deliver"
-msgstr ""
+msgstr "Хүргэхэд бэлэн"
 
 #. module: stock
 #: model:ir.model,name:stock.model_action_traceability
@@ -536,7 +536,7 @@ msgstr "Валютын дундаж үнэ"
 #. module: stock
 #: view:product.product:0
 msgid "Stock and Expected Variations"
-msgstr ""
+msgstr "Нөөц болон таамаглагдсан хазайлт"
 
 #. module: stock
 #: help:product.category,property_stock_valuation_account_id:0
@@ -564,7 +564,7 @@ msgstr ""
 #: code:addons/stock/product.py:196
 #, python-format
 msgid "Products: "
-msgstr "Бараа: "
+msgstr "Бараанууд "
 
 #. module: stock
 #: field:report.stock.inventory,location_type:0
@@ -681,7 +681,7 @@ msgstr "Баглаа"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list_in
 msgid "Receipt Slip"
-msgstr ""
+msgstr "Хүлээн авсан тасалбар"
 
 #. module: stock
 #: code:addons/stock/wizard/stock_move.py:214
@@ -743,7 +743,7 @@ msgstr "Нэмэлт Сурвалжууд"
 #. module: stock
 #: view:stock.partial.picking.line:0
 msgid "Stock Picking Line"
-msgstr ""
+msgstr "Бараа Бэлтгэх баримтын мөр"
 
 #. module: stock
 #: field:stock.location,complete_name:0
@@ -884,7 +884,7 @@ msgstr "Хураангуй"
 #. module: stock
 #: view:product.category:0
 msgid "Account Stock Properties"
-msgstr ""
+msgstr "Барааны дансны үзүүлэлтүүд"
 
 #. module: stock
 #: sql_constraint:stock.picking:0
@@ -936,7 +936,7 @@ msgstr "Гологдол Бараанууд"
 #. module: stock
 #: view:product.product:0
 msgid "- update"
-msgstr ""
+msgstr "- шинэчлэх"
 
 #. module: stock
 #: report:stock.picking.list:0
@@ -974,7 +974,7 @@ msgstr "IT Нийлүүлэгчид"
 #. module: stock
 #: view:stock.config.settings:0
 msgid "Location & Warehouse"
-msgstr ""
+msgstr "Байрлал & Агуулах"
 
 #. module: stock
 #: selection:report.stock.inventory,location_type:0
@@ -993,7 +993,7 @@ msgstr ""
 #. module: stock
 #: field:stock.config.settings,decimal_precision:0
 msgid "Decimal precision on weight"
-msgstr ""
+msgstr "Жингийн аравны нарийвчлал"
 
 #. module: stock
 #: view:stock.production.lot:0
@@ -1049,7 +1049,7 @@ msgstr "Дэлгэрэнгүй"
 #. module: stock
 #: selection:stock.picking,state:0
 msgid "Ready to Transfer"
-msgstr ""
+msgstr "Шилжүүлэхэд бэлэн"
 
 #. module: stock
 #: report:lot.stock.overview:0
@@ -1089,7 +1089,7 @@ msgstr "Журнал"
 #. module: stock
 #: model:ir.actions.act_window,name:stock.action_stock_invoice_onshipping
 msgid "Create Draft Invoices"
-msgstr ""
+msgstr "Ноорог нэхэмжлэл үүсгэх"
 
 #. module: stock
 #: help:stock.picking,location_id:0
@@ -1107,7 +1107,7 @@ msgstr ""
 #. module: stock
 #: selection:stock.picking.in,state:0
 msgid "Ready to Receive"
-msgstr ""
+msgstr "Хүлээн авахад бэлэн"
 
 #. module: stock
 #: view:stock.move:0
@@ -1138,12 +1138,12 @@ msgstr "Захиалгаарх хүлээн авалт/хүргэлт"
 #. module: stock
 #: view:stock.production.lot:0
 msgid "Product Lots"
-msgstr ""
+msgstr "Олон бараанууд"
 
 #. module: stock
 #: view:stock.picking:0
 msgid "Reverse Transfer"
-msgstr ""
+msgstr "Эсрэг шилжүүлэг"
 
 #. module: stock
 #: field:stock.config.settings,group_uos:0
@@ -1217,7 +1217,7 @@ msgstr "Үйлдвэрлэлийн байрлал"
 #: code:addons/stock/product.py:121
 #, python-format
 msgid "Please define journal on the product category: \"%s\" (id: %d)."
-msgstr ""
+msgstr "Дараах барааны ангилалд журналыг тодорхойлно уу. \"%s\"(id:%d)."
 
 #. module: stock
 #: field:report.stock.lines.date,date:0
@@ -1294,7 +1294,7 @@ msgstr ""
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Internal Shipment :"
-msgstr ""
+msgstr "Дотоодын тээвэрлэлт:"
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -1310,7 +1310,7 @@ msgstr "Гар аргаар тохируулах"
 #: view:report.stock.move:0
 #: field:report.stock.move,picking_id:0
 msgid "Shipment"
-msgstr ""
+msgstr "Тээвэрлэлт"
 
 #. module: stock
 #: view:stock.location:0
@@ -1333,7 +1333,7 @@ msgstr ""
 #: code:addons/stock/product.py:113
 #, python-format
 msgid "Please specify company in Location."
-msgstr ""
+msgstr "Компанийг байрлалд тодорхой заана уу."
 
 #. module: stock
 #: view:stock.move:0
@@ -1370,7 +1370,7 @@ msgstr "Тооллого"
 #: code:addons/stock/wizard/stock_move.py:214
 #, python-format
 msgid "Processing Error!"
-msgstr ""
+msgstr "Боловсруулалтын алдаа!"
 
 #. module: stock
 #: help:stock.location,chained_company_id:0
@@ -1415,7 +1415,7 @@ msgstr "Нийт тоо хэмжээ"
 #: field:stock.picking.in,min_date:0
 #: field:stock.picking.out,min_date:0
 msgid "Scheduled Time"
-msgstr ""
+msgstr "Товлосон хугацаа"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.move_consume
@@ -1506,7 +1506,7 @@ msgstr ""
 #: code:addons/stock/stock.py:1890
 #, python-format
 msgid "Warning: No Back Order"
-msgstr ""
+msgstr "Анхааруулга: Захиалга буцаагдаагүй"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_move
@@ -1623,7 +1623,7 @@ msgstr "Хуваах"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list_out
 msgid "Delivery Slip"
-msgstr ""
+msgstr "Хүргэлийн тасалбар"
 
 #. module: stock
 #: model:ir.actions.act_window,name:stock.open_board_warehouse
@@ -1710,7 +1710,7 @@ msgstr "Доод хөдөлгөөнийг хянах"
 #. module: stock
 #: view:stock.picking.in:0
 msgid "Receive"
-msgstr ""
+msgstr "Хүлээн авах"
 
 #. module: stock
 #: model:res.company,overdue_msg:stock.res_company_1
@@ -1795,7 +1795,7 @@ msgstr ""
 #: view:product.product:0
 #: view:product.template:0
 msgid "Storage Location"
-msgstr ""
+msgstr "Хадгалах байрлал"
 
 #. module: stock
 #: help:stock.partial.move.line,currency:0
@@ -1836,7 +1836,7 @@ msgstr "Төлөвлөгдсөн Сар"
 #: help:stock.picking.in,origin:0
 #: help:stock.picking.out,origin:0
 msgid "Reference of the document"
-msgstr ""
+msgstr "Баримтын сурвалж"
 
 #. module: stock
 #: view:stock.picking:0
@@ -1900,7 +1900,7 @@ msgstr "Бэлэн байдлыг цуцлах"
 #: code:addons/stock/wizard/stock_location_product.py:49
 #, python-format
 msgid "Current Inventory"
-msgstr ""
+msgstr "Одоогийн Тооллого"
 
 #. module: stock
 #: help:product.template,property_stock_production:0
@@ -1962,7 +1962,7 @@ msgstr "Хүргэгдсэн Тоо Хэмжээ"
 #. module: stock
 #: view:stock.partial.picking:0
 msgid "Transfer Products"
-msgstr ""
+msgstr "Бараануудыг Шилжүүлэх"
 
 #. module: stock
 #: help:product.template,property_stock_inventory:0
@@ -2140,7 +2140,7 @@ msgstr "Бэлтгэлтийн Буцаалт"
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking_in
 #: model:ir.actions.act_window,name:stock.act_stock_return_picking_out
 msgid "Return Shipment"
-msgstr ""
+msgstr "Буцаах Тээвэрлэлт"
 
 #. module: stock
 #: model:ir.model,name:stock.model_stock_inventory_merge
@@ -2284,7 +2284,7 @@ msgstr "Маршрутын нэр"
 #. module: stock
 #: report:stock.picking.list:0
 msgid "Supplier Address :"
-msgstr ""
+msgstr "Нийлүүлэгчийн хаяг:"
 
 #. module: stock
 #: view:stock.inventory.line:0
@@ -2360,7 +2360,7 @@ msgstr "Нийлүүлэгчийн байрлал"
 #. module: stock
 #: view:stock.location.product:0
 msgid "View Products Inventory"
-msgstr ""
+msgstr "Барааны бүртгэлийг харах"
 
 #. module: stock
 #: view:stock.move:0
@@ -2371,7 +2371,7 @@ msgstr "Үүсгэх"
 #: code:addons/stock/stock.py:1776
 #, python-format
 msgid "Operation forbidden !"
-msgstr ""
+msgstr "Үйлдэл хориотой !"
 
 #. module: stock
 #: view:report.stock.inventory:0
@@ -2909,7 +2909,7 @@ msgstr "Идэвхтэй ID нь Context-д алга"
 #: view:stock.move:0
 #: view:stock.picking:0
 msgid "Force Availability"
-msgstr "боломжийг хурдасгах"
+msgstr "Хүчээр бэлэн болгох"
 
 #. module: stock
 #: field:product.template,loc_rack:0
@@ -3213,7 +3213,7 @@ msgstr ""
 #. module: stock
 #: view:stock.move:0
 msgid "Process"
-msgstr "Процесс"
+msgstr "Гүйцэтгэх"
 
 #. module: stock
 #: field:stock.production.lot.revision,name:0
@@ -4203,7 +4203,7 @@ msgstr "Хийсвэр Барааны Өртөг"
 #: view:stock.picking.in:0
 #: view:stock.picking.out:0
 msgid "Return Products"
-msgstr "Буцаах Бараанууд"
+msgstr "Бараанууд Буцаах"
 
 #. module: stock
 #: view:stock.inventory:0
@@ -4597,7 +4597,7 @@ msgstr "Хүрэх байршил"
 #. module: stock
 #: model:ir.actions.report.xml,name:stock.report_picking_list
 msgid "Picking Slip"
-msgstr ""
+msgstr "Бэлтгэлтийн тасалбар"
 
 #. module: stock
 #: help:stock.move,product_packaging:0
@@ -4868,7 +4868,7 @@ msgstr "Сонголттой: дараалсан хөдөлгөөний үе д
 #. module: stock
 #: view:stock.picking.out:0
 msgid "Print Delivery Slip"
-msgstr ""
+msgstr "Хүргэлтийн тасалбарыг хэвлэх"
 
 #. module: stock
 #: view:report.stock.inventory:0