Merge lp:~openerp-dev/openobject-addons/7.0-invoices-analysis-api into lp:openobject-addons

[Arnaud Pineux (OpenERP)]

This branch replace the old 7.0-bug-account-api because the previous one had too many unnecessary commit.

API

Unmerged revisions

8525. By Arnaud Pineux (OpenERP) on 2013-01-03

[FIX] account_invoice_report: remove unused field and compute values in user currency

=== modified file 'account/i18n/ar.po'
--- account/i18n/ar.po	2012-12-22 06:07:44 +0000
+++ account/i18n/ar.po	2013-01-03 09:27:26 +0000
@@ -1,20 +1,33 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* account
+# Arabic translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 22:53+0000\n"
+=======
+"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-27 19:30+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: gehad shaat <[e-mail]>\n"
-"Language-Team: \n"
+"Language-Team: Arabic <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-28 05:36+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -2781,9 +2794,15 @@
 "الأن  و 50 ٪ في شهر واحد."
 
 #. module: account
+<<<<<<< TREE
 #: field:account.config.settings,purchase_sequence_next:0
 msgid "Next supplier invoice number"
 msgstr ""
+=======
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr "رقم فاتورة المورد التالي"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -6222,7 +6241,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "(update)"
-msgstr ""
+msgstr "(تحديث)"
 
 #. module: account
 #: field:account.aged.trial.balance,filter:0
@@ -6307,7 +6326,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax_template
 msgid "Template Tax Fiscal Position"
-msgstr "الوضع المالي للقالب الضريبي"
+msgstr "قالب الوضع المالي الضريبي"
 
 #. module: account
 #: help:account.tax,name:0
@@ -6356,7 +6375,7 @@
 #. module: account
 #: help:account.config.settings,group_multi_currency:0
 msgid "Allows you multi currency environment"
-msgstr ""
+msgstr "السماح لمناخ متعدد العملات"
 
 #. module: account
 #: view:account.subscription:0
@@ -6445,6 +6464,8 @@
 "You cannot cancel an invoice which is partially paid. You need to "
 "unreconcile related payment entries first."
 msgstr ""
+"لا يمكنك الغاء فاتورة قد تم دفعها جزئيا. يجب ان تلغي تسوية قيود الدفعات "
+"المتعلقة بالفاتورة أولا."
 
 #. module: account
 #: field:product.template,taxes_id:0
@@ -6614,7 +6635,7 @@
 #. module: account
 #: constraint:account.move.line:0
 msgid "You cannot create journal items on closed account."
-msgstr ""
+msgstr "لا يمكنك إنشاء يومية أصناف لحساب مغلق."
 
 #. module: account
 #: code:addons/account/account_invoice.py:610
@@ -6952,6 +6973,8 @@
 "Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for "
 "2%."
 msgstr ""
+"النسبة المئوية لشروط الدفع يجب أن تكون من 0 الى 1. على سبيل المثال: 0.02 "
+"تساوي 2%"
 
 #. module: account
 #: report:account.invoice:0
@@ -6972,7 +6995,7 @@
 #. module: account
 #: sql_constraint:account.tax:0
 msgid "Tax Name must be unique per company!"
-msgstr ""
+msgstr "الاسم الضريبي لكل شركة يجب أن يكون غير متكرر!"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7106,13 +7129,13 @@
 #. module: account
 #: field:account.bank.statement,total_entry_encoding:0
 msgid "Total Transactions"
-msgstr ""
+msgstr "مجموع المعاملات"
 
 #. module: account
 #: code:addons/account/account.py:636
 #, python-format
 msgid "You cannot remove an account that contains journal items."
-msgstr ""
+msgstr "لا يمكنك حذف حساب لديه يوميات متعلقة به"
 
 #. module: account
 #: code:addons/account/account.py:1024
@@ -7162,7 +7185,7 @@
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "You must set a start date."
-msgstr ""
+msgstr "يجب أن تقوم بتحديد تاريخ البدء."
 
 #. module: account
 #: view:account.automatic.reconcile:0
@@ -7208,7 +7231,7 @@
 #: code:addons/account/wizard/account_invoice_refund.py:147
 #, python-format
 msgid "No period found on the invoice."
-msgstr ""
+msgstr "لم يتم العثور على فترة للفاتورة"
 
 #. module: account
 #: help:account.partner.ledger,page_split:0
@@ -7276,7 +7299,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_tax
 msgid "Taxes Fiscal Position"
-msgstr "المركز المالي للضرائب"
+msgstr "الوضع المالي الضريبي"
 
 #. module: account
 #: report:account.general.ledger:0
@@ -7366,7 +7389,7 @@
 #. module: account
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
-msgstr ""
+msgstr "ادارة دفعات العملاء"
 
 #. module: account
 #: help:report.invoice.created,origin:0
@@ -7473,7 +7496,7 @@
 #. module: account
 #: field:account.analytic.line,currency_id:0
 msgid "Account Currency"
-msgstr ""
+msgstr "العملة للحساب"
 
 #. module: account
 #: report:account.invoice:0
@@ -7486,7 +7509,7 @@
 msgid ""
 "You can not delete an invoice which is not cancelled. You should refund it "
 "instead."
-msgstr ""
+msgstr "لا يمكنك حذف فاتورة لم تلغى. يجب أن تستردها."
 
 #. module: account
 #: help:account.tax,amount:0
@@ -7595,7 +7618,7 @@
 #. module: account
 #: field:account.config.settings,purchase_tax_rate:0
 msgid "Purchase tax (%)"
-msgstr ""
+msgstr "ضريبة الشراء (%)"
 
 #. module: account
 #: help:res.partner,credit:0
@@ -7610,7 +7633,7 @@
 #. module: account
 #: model:ir.actions.act_window,name:account.open_account_charts_modules
 msgid "Chart Templates"
-msgstr ""
+msgstr "نماذج الرسم"
 
 #. module: account
 #: field:account.journal.period,icon:0
@@ -7660,7 +7683,7 @@
 #. module: account
 #: field:account.config.settings,group_proforma_invoices:0
 msgid "Allow pro-forma invoices"
-msgstr ""
+msgstr "السماح للفواتير المبدأية"
 
 #. module: account
 #: view:account.bank.statement:0
@@ -7701,7 +7724,7 @@
 #. module: account
 #: help:account.config.settings,currency_id:0
 msgid "Main currency of the company."
-msgstr ""
+msgstr "العملة الرئيسية للشركة."
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_reports
@@ -8032,7 +8055,7 @@
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
 msgid "Credit note sequence"
-msgstr ""
+msgstr "تسلسل إشعار الرصيد"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_validate_account_move
@@ -8117,6 +8140,8 @@
 "Error!\n"
 "You cannot create recursive accounts."
 msgstr ""
+"خطأ!\n"
+"لا يمكنك استخدام حسابات متداخلة."
 
 #. module: account
 #: model:ir.model,name:account.model_cash_box_in
@@ -8436,7 +8461,7 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "No Fiscal Year Defined for This Company"
-msgstr ""
+msgstr "لا يوجد سنة مالية معرفة لهذه الشركة"
 
 #. module: account
 #: view:account.invoice:0
@@ -8467,7 +8492,7 @@
 #: code:addons/account/account.py:1297
 #, python-format
 msgid "Please define a sequence on the journal."
-msgstr ""
+msgstr "الرجاء تعريف تسلسل لليومية"
 
 #. module: account
 #: help:account.tax.template,amount:0
@@ -8540,12 +8565,12 @@
 #: code:addons/account/wizard/account_report_common.py:158
 #, python-format
 msgid "Select a starting and an ending period."
-msgstr ""
+msgstr "اختر فترة بداية ونهاية."
 
 #. module: account
 #: field:account.config.settings,sale_sequence_next:0
 msgid "Next invoice number"
-msgstr ""
+msgstr "رقم الفاتورة التالية"
 
 #. module: account
 #: model:ir.ui.menu,name:account.menu_finance_generic_reporting
@@ -8686,7 +8711,7 @@
 #: code:addons/account/account_invoice.py:389
 #, python-format
 msgid "Unknown Error!"
-msgstr ""
+msgstr "خطأ غير معروف!"
 
 #. module: account
 #: model:ir.model,name:account.model_account_move_bank_reconcile
@@ -8949,7 +8974,7 @@
 #. module: account
 #: field:account.config.settings,sale_tax_rate:0
 msgid "Sales tax (%)"
-msgstr ""
+msgstr "ضريبة المبيعات (%)"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_account_analytic_account_tree2
@@ -9016,6 +9041,8 @@
 "This allows you to check writing and printing.\n"
 "                This installs the module account_check_writing."
 msgstr ""
+"هذا يسمح لك بكتابة الشيكات وطباعتها.\n"
+"                هذا سيقوم بتنصيب account_check_writing module"
 
 #. module: account
 #: model:res.groups,name:account.group_account_invoice
@@ -9118,7 +9145,7 @@
 #: view:account.tax.code.template:0
 #: view:account.tax.template:0
 msgid "Tax Template"
-msgstr ""
+msgstr "نموذج الضريبة"
 
 #. module: account
 #: field:account.invoice.refund,period:0
@@ -9204,7 +9231,7 @@
 #. module: account
 #: field:account.config.settings,has_fiscal_year:0
 msgid "Company has a fiscal year"
-msgstr ""
+msgstr "الشركة لديها سنة مالية"
 
 #. module: account
 #: help:account.tax,child_depend:0
@@ -9220,7 +9247,7 @@
 #: code:addons/account/account.py:634
 #, python-format
 msgid "You cannot deactivate an account that contains journal items."
-msgstr ""
+msgstr "لا يمكنك الغاء تفعيل حساب لديه يوميات ."
 
 #. module: account
 #: selection:account.tax,applicable_type:0
@@ -9404,7 +9431,7 @@
 #. module: account
 #: model:account.account.type,name:account.account_type_liability_view1
 msgid "Liability View"
-msgstr ""
+msgstr "عرض الخصوم"
 
 #. module: account
 #: report:account.account.balance:0
@@ -9452,7 +9479,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Ask Refund"
-msgstr ""
+msgstr "طلب استرداد"
 
 #. module: account
 #: view:account.move.line:0
@@ -9482,7 +9509,7 @@
 #. module: account
 #: field:account.config.settings,purchase_refund_sequence_prefix:0
 msgid "Supplier credit note sequence"
-msgstr ""
+msgstr "تسلسل اشعار رصيد المورد"
 
 #. module: account
 #: code:addons/account/wizard/account_state_open.py:37
@@ -9517,7 +9544,7 @@
 #: code:addons/account/account_move_line.py:827
 #, python-format
 msgid "To reconcile the entries company should be the same for all entries."
-msgstr ""
+msgstr "لتسوية القيود, الشركة يجب أن تكون نفسها لكل القيود المختارة."
 
 #. module: account
 #: field:account.account,balance:0
@@ -9595,7 +9622,7 @@
 #: field:account.cashbox.line,number_closing:0
 #: field:account.cashbox.line,number_opening:0
 msgid "Number of Units"
-msgstr ""
+msgstr "عدد الوحدات"
 
 #. module: account
 #: model:process.node,note:account.process_node_manually0
@@ -9625,7 +9652,7 @@
 #. module: account
 #: view:account.bank.statement:0
 msgid "Date / Period"
-msgstr ""
+msgstr "تاريخ / فترة"
 
 #. module: account
 #: report:account.central.journal:0
@@ -9704,7 +9731,7 @@
 #: field:account.config.settings,default_sale_tax:0
 #: field:account.config.settings,sale_tax:0
 msgid "Default sale tax"
-msgstr ""
+msgstr "ضريبة المبيعات الافتراضية"
 
 #. module: account
 #: report:account.overdue:0
@@ -9888,7 +9915,7 @@
 #: view:cash.box.in:0
 #: model:ir.actions.act_window,name:account.action_cash_box_in
 msgid "Put Money In"
-msgstr ""
+msgstr "أدخل نقود"
 
 #. module: account
 #: selection:account.account.type,close_method:0
@@ -9946,7 +9973,7 @@
 #. module: account
 #: view:account.installer:0
 msgid "Configure your Fiscal Year"
-msgstr ""
+msgstr "قم باعداد السنة المالية"
 
 #. module: account
 #: field:account.period,name:0
@@ -10078,7 +10105,7 @@
 #: code:addons/account/account.py:1064
 #, python-format
 msgid "Start period should precede then end period."
-msgstr ""
+msgstr "فترة البدأ يجب أن تكون قبل فترة الانتهاء"
 
 #. module: account
 #: field:account.invoice,number:0
@@ -10163,7 +10190,7 @@
 #: code:addons/account/account_invoice.py:387
 #, python-format
 msgid "There is no Sale/Purchase Journal(s) defined."
-msgstr ""
+msgstr "لا يوجد يوميات بيع/شراء معرفة"
 
 #. module: account
 #: view:account.move.line.reconcile.select:0
@@ -10241,7 +10268,7 @@
 #. module: account
 #: field:account.subscription.generate,date:0
 msgid "Generate Entries Before"
-msgstr ""
+msgstr "إنشاء قيود قبل"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_subscription_form_running
@@ -10497,7 +10524,7 @@
 #: code:addons/account/account_move_line.py:1059
 #, python-format
 msgid "Unable to change tax!"
-msgstr ""
+msgstr "لا يمكنك تغيير الضريبة!"
 
 #. module: account
 #: constraint:account.bank.statement:0
@@ -10546,7 +10573,7 @@
 #. module: account
 #: field:account.config.settings,module_account_followup:0
 msgid "Manage customer payment follow-ups"
-msgstr ""
+msgstr "إدارة متابعة دفعات العميل"
 
 #. module: account
 #: model:ir.model,name:account.model_report_account_sales
@@ -10556,7 +10583,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_fiscal_position_account
 msgid "Accounts Fiscal Position"
-msgstr "المركز السنوي للحسابات"
+msgstr "الوضع المالي للحسابات"
 
 #. module: account
 #: report:account.invoice:0
@@ -10622,7 +10649,7 @@
 #: code:addons/account/account_move_line.py:783
 #, python-format
 msgid "Already reconciled."
-msgstr ""
+msgstr "قد تمت تسويته مسبقا"
 
 #. module: account
 #: selection:account.model.line,date_maturity:0
@@ -10670,7 +10697,7 @@
 #: help:account.move,balance:0
 msgid ""
 "This is a field only used for internal purpose and shouldn't be displayed"
-msgstr ""
+msgstr "هذا الحقل يستخدم لأسباب داخلية و لا يجب عرضه"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -10751,7 +10778,7 @@
 msgid ""
 "The selected unit of measure is not compatible with the unit of measure of "
 "the product."
-msgstr ""
+msgstr "وحدة القياس التي اخترتها غير متوافقة مع وحدة قياس المنتج."
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -10810,7 +10837,7 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "Install more chart templates"
-msgstr ""
+msgstr "تنصيب نماذج رسوم اضافية"
 
 #. module: account
 #: report:account.general.journal:0
@@ -10857,7 +10884,7 @@
 msgid ""
 "You cannot remove/deactivate an account which is set on a customer or "
 "supplier."
-msgstr ""
+msgstr "لا يمكنك حذف/الغاء تفعيل حساب مرتبط بعميل أو مورد"
 
 #. module: account
 #: model:ir.model,name:account.model_validate_account_move_lines
@@ -10868,7 +10895,7 @@
 #: help:res.partner,property_account_position:0
 msgid ""
 "The fiscal position will determine taxes and accounts used for the partner."
-msgstr ""
+msgstr "الوضع المالي سيحدد الضرائب والحسابات المستخدمة للعميل/الشريك"
 
 #. module: account
 #: model:process.node,note:account.process_node_supplierpaidinvoice0
@@ -10884,7 +10911,7 @@
 #: code:addons/account/wizard/account_change_currency.py:59
 #, python-format
 msgid "New currency is not configured properly."
-msgstr ""
+msgstr "العملة الجديدة غير معرفة بشكل صحيح."
 
 #. module: account
 #: view:account.account.template:0
@@ -10900,7 +10927,7 @@
 #: code:addons/account/account_invoice.py:554
 #, python-format
 msgid "The payment term of supplier does not have a payment term line."
-msgstr ""
+msgstr "لا يوجد شروط دفع للمورد في خانة شروط الدفع"
 
 #. module: account
 #: field:account.account,parent_right:0
@@ -10967,7 +10994,7 @@
 #: code:addons/account/account_cash_statement.py:292
 #, python-format
 msgid "Loss"
-msgstr ""
+msgstr "خسائر"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -11047,6 +11074,8 @@
 "This label will be displayed on report to show the balance computed for the "
 "given comparison filter."
 msgstr ""
+"سيتم عرض هذه التسمية على التقرير لاظهار التوازن المحسوب من قيم مصفيات "
+"المقارنة المعطاة."
 
 #. module: account
 #: selection:account.config.settings,tax_calculation_rounding_method:0
@@ -11061,6 +11090,7 @@
 msgstr ""
 "المبلغ المتبقي على الدائن أو المدين لقيد اليومية معبر عنها بعملتها (ربما "
 "تكون مختلفة لعملة الشركة)."
+<<<<<<< TREE
 
 #~ msgid "Print Taxes Report"
 #~ msgstr "طباعة تقرير الضرائب"
@@ -13745,3 +13775,5 @@
 #, python-format
 #~ msgid "Supplier invoice"
 #~ msgstr "فاتورة المورد"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/bg.po'
--- account/i18n/bg.po	2012-12-22 06:07:44 +0000
+++ account/i18n/bg.po	2013-01-03 09:27:26 +0000
@@ -1,20 +1,35 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account
+# Bulgarian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:28+0000\n"
 "Last-Translator: Dimitar Markov <[e-mail]>\n"
 "Language-Team: \n"
+=======
+"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"
+"Language-Team: Bulgarian <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10909,6 +10924,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #, python-format
 #~ msgid ""
@@ -12770,3 +12786,5 @@
 #~ msgstr ""
 #~ "Не можете да използвате общата сметка с този дневник. Отметнете полето "
 #~ "'Контрол на записите' в съответния дневник"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/br.po'
--- account/i18n/br.po	2012-12-22 06:07:44 +0000
+++ account/i18n/br.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # Breton translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-12 09:25+0000\n"
 "Last-Translator: OpenERP Administrators <Unknown>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Breton <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10820,28 +10831,3 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
-
-#~ msgid "Other Configuration"
-#~ msgstr "Kefluniadur all"
-
-#~ msgid "Account currency"
-#~ msgstr "Moneiz ar gont"
-
-#~ msgid "Negative"
-#~ msgstr "Negativel"
-
-#~ msgid "All Analytic Entries"
-#~ msgstr "An holl enmontoù analitek"
-
-#~ msgid "Choose Fiscal Year "
-#~ msgstr "Dibab ar bloavezh tellus "
-
-#~ msgid "Origin"
-#~ msgstr "Mammenn"
-
-#, python-format
-#~ msgid "You can not add/modify entries in a closed journal."
-#~ msgstr "N'hallit ket ouzhpennañ/kemmañ enmontoù en ur marilh serr"
-
-#~ msgid "Close Fiscalyear"
-#~ msgstr "Serriñ ar bloavezh tellus"

=== modified file 'account/i18n/bs.po'
--- account/i18n/bs.po	2012-12-22 06:07:44 +0000
+++ account/i18n/bs.po	2013-01-03 09:27:26 +0000
@@ -1,20 +1,35 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account
+# Bosnian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:18+0000\n"
 "Last-Translator: Fabien (Open ERP) <[e-mail]>\n"
 "Language-Team: \n"
+=======
+"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"
+"Language-Team: Bosnian <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10865,6 +10880,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #~ msgid "Invalid model name in the action definition."
 #~ msgstr "Neispravan naziv modela u definiciji zadatka."
@@ -12349,3 +12365,5 @@
 
 #~ msgid "Choose Fiscal Year "
 #~ msgstr "Izaberite fiskalnu godinu "
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/ca.po'
--- account/i18n/ca.po	2012-12-22 06:07:44 +0000
+++ account/i18n/ca.po	2013-01-03 09:27:26 +0000
@@ -1,20 +1,35 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* account
+# Catalan translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:27+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 23:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -11040,6 +11055,7 @@
 msgstr ""
 "L'import residual d'una anotació a cobrar o a pagar expressat en la seva "
 "moneda (pot ser diferent de la moneda de la companyia)."
+<<<<<<< TREE
 
 #, python-format
 #~ msgid "Integrity Error !"
@@ -14566,3 +14582,5 @@
 #, python-format
 #~ msgid "Invoice  '%s' is validated."
 #~ msgstr "Factura '%s' és validada."
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/cs.po'
--- account/i18n/cs.po	2012-12-22 06:07:44 +0000
+++ account/i18n/cs.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,35 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# * account
+# Czech translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
+<<<<<<< TREE
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-06-20 16:14+0000\n"
 "Last-Translator: Jiří Hajda <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\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"
+"Language-Team: Czech <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 "X-Poedit-Language: Czech\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10888,6 +10902,7 @@
 msgstr ""
 "Zbytková částka pohledávkovém a závazkovém záznamu knihy vyjádřená ve své "
 "měně (může být jiná než měna společnosti)."
+<<<<<<< TREE
 
 #~ msgid "Generate entries before:"
 #~ msgstr "Generovat položky před:"
@@ -12701,3 +12716,5 @@
 
 #~ msgid "Error ! You can not create recursive categories."
 #~ msgstr "Chyba ! Nemůžete vytvořit rekurzivní kategorie."
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/da.po'
--- account/i18n/da.po	2012-12-22 06:07:44 +0000
+++ account/i18n/da.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # Danish translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:09+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+=======
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 23:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Danish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10838,6 +10849,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #~ msgid "Unpaid Supplier Invoices"
 #~ msgstr "Ubetalte leverandør fakturaer."
@@ -11080,3 +11092,5 @@
 
 #~ msgid "last month"
 #~ msgstr "sidste måned"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/de.po'
--- account/i18n/de.po	2012-12-22 06:07:44 +0000
+++ account/i18n/de.po	2013-01-03 09:27:26 +0000
@@ -1,20 +1,32 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* account
+# German translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-21 01:59+0000\n"
+=======
+"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-27 18:31+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Thorsten Vocks (OpenBig.org) <thorsten.vocks@big-"
 "consulting.net>\n"
-"Language-Team: \n"
+"Language-Team: German <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-28 05:36+0000\n"
+>>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -257,11 +269,19 @@
 msgstr "Auswertungen für Belgien"
 
 #. module: account
+<<<<<<< TREE
 #: model:mail.message.subtype,name:account.mt_invoice_validated
 msgid "Validated"
 msgstr ""
 
 #. module: account
+=======
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr "Bestätigt"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
 msgstr "Erlöse Ansicht"
@@ -472,11 +492,19 @@
 "Buchhaltung installieren (Buchungssätze im Journal, Kontenpläne, etc.)"
 
 #. module: account
+<<<<<<< TREE
 #: help:account.bank.statement.line,name:0
 msgid "Originator to Beneficiary Information"
 msgstr ""
 
 #. module: account
+=======
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr "Auftrageber oder Begünstigter"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
 #, python-format
@@ -492,11 +520,21 @@
 msgstr "Kontenplan Vorlage"
 
 #. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create refund, reconcile and create a new draft invoice"
-msgstr ""
-
-#. module: account
+<<<<<<< TREE
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
+#. module: account
+=======
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+"Bearbeiten: Gutschriften erstellen, Kontenabstimmung und neue "
+"Rechnungsentwürfe anlegen"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
 "If you select 'Round per line' : for each tax, the tax amount will first be "
@@ -803,11 +841,19 @@
 msgstr "Konfigurieren Sie Ihre Hausbanken"
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice.refund:0
 msgid "Create Refund"
 msgstr ""
 
 #. module: account
+=======
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr "Gutschrift anlegen"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -832,12 +878,21 @@
 msgstr "Möchten Sie diese Buchungen erzeugen?"
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:1329
 #, python-format
 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
 msgstr ""
 
 #. module: account
+=======
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr "Rechnungsteilzahlung: %s%s über %s%s (%s%s Restbetrag)."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.invoice:0
 msgid "Print Invoice"
 msgstr "Rechnung drucken"
@@ -1056,9 +1111,15 @@
 msgstr "Einkauf Journal"
 
 #. module: account
+<<<<<<< TREE
 #: model:mail.message.subtype,description:account.mt_invoice_paid
 msgid "Invoice paid"
 msgstr ""
+=======
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
+msgstr "Rechnung bezahlt"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:validate.account.move:0
@@ -1949,12 +2010,21 @@
 msgstr "Verkäufe nach Kontotypen"
 
 #. module: account
+<<<<<<< TREE
 #: model:account.payment.term,name:account.account_payment_term_15days
 #: model:account.payment.term,note:account.account_payment_term_15days
 msgid "15 Days"
 msgstr ""
 
 #. module: account
+=======
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr "15 Tage"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
 msgstr "Abrechnung"
@@ -2094,11 +2164,19 @@
 msgstr "Beleg Entwurf"
 
 #. module: account
+<<<<<<< TREE
 #: model:mail.message.subtype,description:account.mt_invoice_validated
 msgid "Invoice validated"
 msgstr ""
 
 #. module: account
+=======
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr "Rechnung bestätigt"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
 msgstr "Lieferantenzahlung durch Scheck"
@@ -2832,11 +2910,19 @@
 msgstr "Einstellungen Finanzbuchhaltung"
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft refund"
 msgstr ""
 
 #. module: account
+=======
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr "Gutschriftsentwurf anlegen"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
 msgstr "Offene Posten Ausgleich bei Partnern"
@@ -3387,10 +3473,17 @@
 "vorgeschrieben, ist allerdings sehr nützlich für einige Berichte."
 
 #. module: account
+<<<<<<< TREE
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile Transactions"
 msgstr ""
+=======
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr "Nicht abgestimmte Buchungen"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3587,9 +3680,15 @@
 msgstr "Anzahl Stellen für Konto"
 
 #. module: account
+<<<<<<< TREE
 #: field:res.partner,property_supplier_payment_term:0
 msgid "Supplier Payment Term"
 msgstr ""
+=======
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr "Zahlungsbedingungen des Lieferanten"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3662,11 +3761,19 @@
 msgstr "Elektronische Datei"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.move.line,reconcile:0
 msgid "Reconcile Ref"
 msgstr ""
 
 #. module: account
+=======
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr "Abstimmungsref."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr "Das Unternehmen hat einen Kontenplan"
@@ -3682,89 +3789,257 @@
 msgstr "Partner Kontoauszug"
 
 #. module: account
-#: model:email.template,body_html:account.email_template_edi_invoice
-msgid ""
-"\n"
-"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
-"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
-"\n"
-"    <p>Hello ${object.partner_id.name},</p>\n"
-"\n"
-"    <p>A new invoice is available for you: </p>\n"
-"    \n"
-"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
-"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
-"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
-"${object.currency_id.name}</strong><br />\n"
-"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
-"       % if object.origin:\n"
-"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
-"       % endif\n"
-"       % if object.user_id:\n"
-"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
-"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
-"       % endif\n"
-"    </p>  \n"
-"    \n"
-"    % if object.paypal_url:\n"
-"    <br/>\n"
-"    <p>It is also possible to directly pay with Paypal:</p>\n"
-"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
-"            <img class=\"oe_edi_paypal_button\" "
-"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
-"        </a>\n"
-"    % endif\n"
-"    \n"
-"    <br/>\n"
-"    <p>If you have any question, do not hesitate to contact us.</p>\n"
-"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
-"    <br/>\n"
-"    <br/>\n"
-"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
-"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
-"background-repeat: repeat no-repeat;\">\n"
-"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
-"#DDD;\">\n"
-"            <strong style=\"text-"
-"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
-"    </div>\n"
-"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
-"16px; background-color: #F2F2F2;\">\n"
-"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
-"        % if object.company_id.street:\n"
-"            ${object.company_id.street}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.street2:\n"
-"            ${object.company_id.street2}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.city or object.company_id.zip:\n"
-"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
-"        % endif\n"
-"        % if object.company_id.country_id:\n"
-"            ${object.company_id.state_id and ('%s, ' % "
-"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
-"or ''}<br/>\n"
-"        % endif\n"
-"        </span>\n"
-"        % if object.company_id.phone:\n"
-"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
-"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
-"0px; padding-left: 0px; \">\n"
-"                Phone:&nbsp; ${object.company_id.phone}\n"
-"            </div>\n"
-"        % endif\n"
-"        % if object.company_id.website:\n"
-"            <div>\n"
-"                Web :&nbsp;<a "
-"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
-"            </div>\n"
-"        %endif\n"
-"        <p></p>\n"
-"    </div>\n"
-"</div>\n"
-"            "
-msgstr ""
+<<<<<<< TREE
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+=======
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"    \n"
+"    <p>Hallo ${object.partner_id.name},</p>\n"
+"    \n"
+"    <p>Es steht eine neue Rechnung für Sie zum Abruf bereit: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"        &nbsp;&nbsp;<strong>RECHNUNGSINFORMATIONEN</strong><br />\n"
+"        &nbsp;&nbsp;Rechnungsnummer: <strong>${object.number}</strong><br "
+"/>\n"
+"        &nbsp;&nbsp;Rechnungsbetrag: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"        &nbsp;&nbsp;Rechnungsdatum: ${object.date_invoice}<br />\n"
+"        % if object.origin:\n"
+"        &nbsp;&nbsp;Bestellnummer: ${object.origin}<br />\n"
+"        % endif\n"
+"        % if object.user_id:\n"
+"        &nbsp;&nbsp;Ihr Ansprechpartner: <a "
+"href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"        % endif\n"
+"    </p>\n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>Sie können die Rechnung per PayPal überweisen:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>Bei Fragen stehen wir Ihnen gerne zur Verfügung.</p>\n"
+"    <p>Danke das Sie ${object.company_id.name or 'uns'} gewählt haben!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Telefon:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.period:0
@@ -4757,13 +5032,25 @@
 msgstr "Saldo Kostenstelle"
 
 #. module: account
-#: help:res.partner,property_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for sale orders "
-"and customer invoices"
-msgstr ""
-
-#. module: account
+<<<<<<< TREE
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
+#. module: account
+=======
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+"Diese Zahlungsbedingung statt der Standardzahlungsbedingung für Angeobte und "
+"Kundenrechnungen verwenden"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.config.settings:0
 msgid ""
 "If you put \"%(year)s\" in the prefix, it will be replaced by the current "
@@ -4784,7 +5071,12 @@
 #. module: account
 #: view:account.move.line:0
 msgid "Posted Journal Items"
-msgstr "Quittierte Buchungen"
+msgstr "Buchungssätze"
+
+#. module: account
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr "Keine Zahlungserinnerung"
 
 #. module: account
 #: field:account.move.line,blocked:0
@@ -4960,11 +5252,19 @@
 msgstr "Kontoart"
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.journal,type:0
 msgid "Bank and Checks"
 msgstr ""
 
 #. module: account
+=======
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr "Bank und Schecks"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.account.template,note:0
 msgid "Note"
 msgstr "Bemerkung"
@@ -5090,9 +5390,15 @@
 msgstr "Kontenplan Finanzkonten"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.invoice,reference_type:0
 msgid "Payment Reference"
 msgstr ""
+=======
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr "Zahlungsreferenz"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5164,11 +5470,19 @@
 msgstr "Auszugleichende Buchungszeilen"
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.model,name:account.model_account_tax_template
 msgid "Templates for Taxes"
 msgstr ""
 
 #. module: account
+=======
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr "Vorlagen für Steuern"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
 msgstr "Die Periodenbezeichnung muss je Unternehmen eindeutig sein."
@@ -5468,7 +5782,7 @@
 #. module: account
 #: view:account.move:0
 msgid "Posted Journal Entries"
-msgstr "Quittierte Buchungen"
+msgstr "Buchungssätze"
 
 #. module: account
 #: view:account.use.model:0
@@ -6225,7 +6539,7 @@
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Unposted"
-msgstr "Nicht quittiert"
+msgstr "Nicht gebucht"
 
 #. module: account
 #: view:account.change.currency:0
@@ -6308,13 +6622,25 @@
 "Die Erfassung der Zahlung ist der zweite Schritt beim Zahlungsausgleich."
 
 #. module: account
-#: help:res.partner,property_supplier_payment_term:0
-msgid ""
-"This payment term will be used instead of the default one for purchase "
-"orders and supplier invoices"
-msgstr ""
-
-#. module: account
+<<<<<<< TREE
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
+#. module: account
+=======
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+"Diese Zahlungsbedinungen werden anstatt der Standardzahlungsbedingung für "
+"Lieferantenaufträge und -rechnungen verwendet"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.automatic.reconcile,power:0
 msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
@@ -7145,14 +7471,32 @@
 msgstr "Anwendbarer Typ"
 
 #. module: account
-#: help:account.invoice,date_due:0
-msgid ""
-"If you use payment terms, the due date will be computed automatically at the "
-"generation of accounting entries. The payment term may compute several due "
-"dates, for example 50% now and 50% in one month, but if you want to force a "
-"due date, make sure that the payment term is not set on the invoice. If you "
-"keep the payment term and the due date empty, it means direct payment."
-msgstr ""
+<<<<<<< TREE
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
+=======
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
+"Wenn Sie Zahlungsbedingungen verwenden, wird das Fälligkeitsdatum "
+"automatisch bei der Erzeugung der Buchungssätze berechnet. Die "
+"Zahlungsbedingung kann mehrere Fälligkeitsdaten berechnen, z.B. bei "
+"Fälligkeit von 50% sofort und 50% in 30 Tagen. Wenn Sie jedoch ein "
+"Fälligkeitsdatum manuell setzen möchten, stellen Sie sicher das keine "
+"Zahlungsbedingung ausgewählt ist. Wenn Sie sowohl Zahlungsbedingung als auch "
+"das Fälligkeitsdatum frei lassen, wird die Rechnung sofort fällig gesetzt."
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: code:addons/account/account.py:414
@@ -7393,13 +7737,26 @@
 msgstr "Barzahlungen"
 
 #. module: account
-#: view:account.unreconcile:0
-msgid ""
-"If you unreconcile transactions, you must also verify all the actions that "
-"are linked to those transactions because they will not be disabled"
-msgstr ""
-
-#. module: account
+<<<<<<< TREE
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
+#. module: account
+=======
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+"Wenn Sie die Kontenabstimmung rückgängig machen wollen, stellen Sie sicher "
+"das alle auf diese Buchungen bezogenen Aktionen rückgängig gemacht wurden, "
+"da sie nicht automatisiert zurückgesetzt werden"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.account.template:0
 #: view:account.bank.statement:0
 #: field:account.bank.statement.line,note:0
@@ -7570,11 +7927,19 @@
 msgstr "Manuell"
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: create refund and reconcile"
 msgstr ""
 
 #. module: account
+=======
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr "Abbrechen: Gutschrift erzeugen und verbuchen"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "You must set a start date."
@@ -7790,11 +8155,19 @@
 "z. B.  Meine Buchungsvorlage am %(date)s"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.invoice,paypal_url:0
 msgid "Paypal Url"
 msgstr ""
 
 #. module: account
+=======
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr "PayPal URL"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
 msgstr "Management Kundenzahlungen"
@@ -8022,7 +8395,7 @@
 #. module: account
 #: view:account.entries.report:0
 msgid "Posted entries"
-msgstr "Quittierte Buchungen"
+msgstr "Buchungen"
 
 #. module: account
 #: help:account.payment.term.line,value_amount:0
@@ -8412,7 +8785,7 @@
 #. module: account
 #: view:account.move:0
 msgid "Unposted Journal Entries"
-msgstr "Nicht Quittierte Buchungen"
+msgstr "Buchungssatz Vorschläge"
 
 #. module: account
 #: help:account.invoice.refund,date:0
@@ -8510,9 +8883,15 @@
 msgstr "Die Einträge werden entsprechend Ihrer Sequenz aufsteigend sortiert"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount in Currency"
 msgstr ""
+=======
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr "Verbleibender Betrag in Währung"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -9136,11 +9515,19 @@
 msgstr "Endsaldo"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.journal,centralisation:0
 msgid "Centralized Counterpart"
 msgstr ""
 
 #. module: account
+=======
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr "Zentrales Gegenkonto"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.move.line,blocked:0
 msgid ""
 "You can check this box to mark this journal item as a litigation with the "
@@ -9209,12 +9596,22 @@
 msgstr "Kontoartkonfiguration"
 
 #. module: account
-#: model:email.template,subject:account.email_template_edi_invoice
-msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account_move_line.py:1211
+<<<<<<< TREE
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
+=======
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+"${object.company_id.name} Rechnungsnummer ( ${object.number or 'n/a'})"
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -9652,7 +10049,7 @@
 #. module: account
 #: model:process.transition,note:account.process_transition_validentries0
 msgid "Accountant validates the accounting entries coming from the invoice."
-msgstr "Ein Buchhalter quittiert die Buchungssätze einer Rechnung"
+msgstr "Ein Buchhalter verbucht die Buchungssätze einer Rechnung"
 
 #. module: account
 #: view:account.entries.report:0
@@ -10311,11 +10708,19 @@
 "Es können keine Buchungen für verschiedene Unternehmen generiert werden."
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodic Processing"
 msgstr ""
 
 #. module: account
+=======
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr "Periodische Verarbeitung"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
 msgstr "Kunden und Lieferantenrechnungen"
@@ -10390,6 +10795,7 @@
 msgstr "Fälligkeitsdatum"
 
 #. module: account
+<<<<<<< TREE
 #: model:account.payment.term,name:account.account_payment_term_immediate
 #: model:account.payment.term,note:account.account_payment_term_immediate
 msgid "Immediate Payment"
@@ -10397,6 +10803,15 @@
 
 #. module: account
 #: code:addons/account/account.py:1464
+=======
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr "Sofortige Zahlung"
+
+#. module: account
+#: code:addons/account/account.py:1464
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid " Centralisation"
 msgstr " Zusammenfassung"
@@ -10878,7 +11293,7 @@
 #: selection:account.move,state:0
 #: view:account.move.line:0
 msgid "Posted"
-msgstr "Quittiert"
+msgstr "Gebucht"
 
 #. module: account
 #: report:account.account.balance:0
@@ -11106,14 +11521,27 @@
 msgstr "Konten ohne Buchung? "
 
 #. module: account
-#: view:account.unreconcile.reconcile:0
-msgid ""
-"If you unreconcile transactions, you must also verify all the actions that "
-"are linked to those transactions because they will not be disable"
-msgstr ""
-
-#. module: account
-#: code:addons/account/account_move_line.py:1059
+<<<<<<< TREE
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
+=======
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+"Wenn Sie Zahlungen stornieren, müssen Sie auch alle zugehörigen "
+"Transaktionen prüfen, weil diese nicht nicht automatisch deaktiviert sind."
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Unable to change tax!"
 msgstr "Eine Änderung der Steuer ist nicht möglich"
@@ -11703,11 +12131,19 @@
 msgstr "Aufwandskonto für Produktvorlage"
 
 #. module: account
+<<<<<<< TREE
 #: field:res.partner,property_payment_term:0
 msgid "Customer Payment Term"
 msgstr ""
 
 #. module: account
+=======
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr "Zahlungsbedingunen für Kunden"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:accounting.report,label_filter:0
 msgid ""
 "This label will be displayed on report to show the balance computed for the "
@@ -11729,6 +12165,7 @@
 msgstr ""
 "Der verbleibende Saldo auf einem Debitor oder Kreditor nach vorgenommenen "
 "Buchung in der Landeswährung."
+<<<<<<< TREE
 
 #~ msgid "Compute Taxes"
 #~ msgstr "Berechne Steuern"
@@ -15941,3 +16378,5 @@
 
 #~ msgid "  Valuation: Percent"
 #~ msgstr "  Berechnungsform: Prozent"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/el.po'
--- account/i18n/el.po	2012-12-22 06:07:44 +0000
+++ account/i18n/el.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # Greek translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:59+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Greek <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10893,6 +10904,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #~ msgid "Reconciliation result"
 #~ msgstr "Αποτελέσματα Εκκαθάρισης"
@@ -13005,3 +13017,5 @@
 #~ "\n"
 #~ "Μπορείς να δημιουργήσεις από το μενού: \n"
 #~ "Παραμετροποίηση/Οικονμική Λογιστικής/Λογαριασμοί/Ημερολόγια"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/en_GB.po'
--- account/i18n/en_GB.po	2012-12-22 06:07:44 +0000
+++ account/i18n/en_GB.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 18:25+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: English (United Kingdom) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 07:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10859,6 +10870,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #~ msgid "Voucher Management"
 #~ msgstr "Voucher Management"
@@ -11997,3 +12009,5 @@
 #, python-format
 #~ msgid "Date to must be set between %s and %s"
 #~ msgstr "Date to must be set between %s and %s"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/en_US.po'
--- account/i18n/en_US.po	2012-12-22 06:07:44 +0000
+++ account/i18n/en_US.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # English (United States) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-01-09 14:42+0000\n"
 "Last-Translator: Raphaël Valyi - http://www.akretion.com <Unknown>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: English (United States) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:35+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 07:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10820,17 +10831,3 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
-
-#~ msgid ""
-#~ "It adds the currency column if the currency is different then the company "
-#~ "currency"
-#~ msgstr ""
-#~ "It adds the currency column if the currency is different from the company "
-#~ "currency"
-
-#~ msgid ""
-#~ "Print Report with the currency column if the currency is different then the "
-#~ "company currency"
-#~ msgstr ""
-#~ "Print Report with the currency column if the currency is different from the "
-#~ "company currency"

=== modified file 'account/i18n/es.po'
--- account/i18n/es.po	2012-12-25 04:48:40 +0000
+++ account/i18n/es.po	2013-01-03 09:27:26 +0000
@@ -1,19 +1,33 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account
+# Spanish translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-24 11:01+0000\n"
 "Last-Translator: Pedro Manuel Baeza <[e-mail]>\n"
 "Language-Team: \n"
+=======
+"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"
+"Language-Team: Spanish <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-25 04:47+0000\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:59+0000\n"
+>>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
@@ -257,11 +271,19 @@
 msgstr "Informes Belgas"
 
 #. module: account
+<<<<<<< TREE
 #: model:mail.message.subtype,name:account.mt_invoice_validated
 msgid "Validated"
 msgstr "Validado"
 
 #. module: account
+=======
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
 msgstr "Vista de ingresos"
@@ -469,11 +491,19 @@
 "contabilidad (asientos contables, plan de cuentas, ...)"
 
 #. module: account
+<<<<<<< TREE
 #: help:account.bank.statement.line,name:0
 msgid "Originator to Beneficiary Information"
 msgstr "Información del emisor al beneficiario"
 
 #. module: account
+=======
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
 #, python-format
@@ -489,12 +519,20 @@
 msgstr "Plantilla plan contable"
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Modify: create refund, reconcile and create a new draft invoice"
 msgstr ""
 "Modificar: crea el reembolso, concilia y crea una nueva factura borrador"
 
 #. module: account
+=======
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
 "If you select 'Round per line' : for each tax, the tax amount will first be "
@@ -802,11 +840,19 @@
 msgstr "Configure los números de cuenta bancaria de su compañía"
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice.refund:0
 msgid "Create Refund"
 msgstr "Crear factura rectificativa"
 
 #. module: account
+=======
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -831,12 +877,21 @@
 msgstr "¿Está seguro que desea crear los asientos?"
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:1329
 #, python-format
 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
 msgstr "Factura parcialmente pagada: %s %s de %s %s (%s %s restante)."
 
 #. module: account
+=======
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.invoice:0
 msgid "Print Invoice"
 msgstr "Imprimir factura"
@@ -1052,9 +1107,15 @@
 msgstr "Diario de compra"
 
 #. module: account
+<<<<<<< TREE
 #: model:mail.message.subtype,description:account.mt_invoice_paid
 msgid "Invoice paid"
 msgstr "Factura pagada"
+=======
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:validate.account.move:0
@@ -1931,12 +1992,21 @@
 msgstr "Ventas por tipo de cuenta"
 
 #. module: account
+<<<<<<< TREE
 #: model:account.payment.term,name:account.account_payment_term_15days
 #: model:account.payment.term,note:account.account_payment_term_15days
 msgid "15 Days"
 msgstr "15 días"
 
 #. module: account
+=======
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
 msgstr "Facturación"
@@ -2076,11 +2146,19 @@
 msgstr "Extracto borrador"
 
 #. module: account
+<<<<<<< TREE
 #: model:mail.message.subtype,description:account.mt_invoice_validated
 msgid "Invoice validated"
 msgstr "Factura validada"
 
 #. module: account
+=======
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
 msgstr "Pagar a proveedores mediante cheque"
@@ -2802,11 +2880,19 @@
 msgstr "Propiedades de la cuenta"
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft refund"
 msgstr "Crear una factura rectificativa borrador"
 
 #. module: account
+=======
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
 msgstr "Conciliciación empresa"
@@ -3350,10 +3436,17 @@
 "para algunos informes."
 
 #. module: account
+<<<<<<< TREE
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile Transactions"
 msgstr "Transacciones sin conciliar"
+=======
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3549,9 +3642,15 @@
 msgstr "Núm. de dígitos a usar para código de cuenta."
 
 #. module: account
+<<<<<<< TREE
 #: field:res.partner,property_supplier_payment_term:0
 msgid "Supplier Payment Term"
 msgstr "Plazo de pago del proveedor"
+=======
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3624,11 +3723,19 @@
 msgstr "Archivo electrónico"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.move.line,reconcile:0
 msgid "Reconcile Ref"
 msgstr "Referencia de conciliación"
 
 #. module: account
+=======
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr "La compañía tiene un árbol de cuentas"
@@ -3644,6 +3751,7 @@
 msgstr "Contabilidad. Libro mayor empresa"
 
 #. module: account
+<<<<<<< TREE
 #: model:email.template,body_html:account.email_template_edi_invoice
 msgid ""
 "\n"
@@ -3807,6 +3915,91 @@
 "    </div>\n"
 "</div>\n"
 "            "
+=======
+#: model:email.template,body_html:account.email_template_edi_invoice
+msgid ""
+"\n"
+"<div style=\"font-family: 'Lucica Grande', Ubuntu, Arial, Verdana, sans-"
+"serif; font-size: 12px; color: rgb(34, 34, 34); background-color: #FFF; \">\n"
+"\n"
+"    <p>Hello ${object.partner_id.name},</p>\n"
+"\n"
+"    <p>A new invoice is available for you: </p>\n"
+"    \n"
+"    <p style=\"border-left: 1px solid #8e0000; margin-left: 30px;\">\n"
+"       &nbsp;&nbsp;<strong>REFERENCES</strong><br />\n"
+"       &nbsp;&nbsp;Invoice number: <strong>${object.number}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice total: <strong>${object.amount_total} "
+"${object.currency_id.name}</strong><br />\n"
+"       &nbsp;&nbsp;Invoice date: ${object.date_invoice}<br />\n"
+"       % if object.origin:\n"
+"       &nbsp;&nbsp;Order reference: ${object.origin}<br />\n"
+"       % endif\n"
+"       % if object.user_id:\n"
+"       &nbsp;&nbsp;Your contact: <a href=\"mailto:${object.user_id.email or "
+"''}?subject=Invoice%20${object.number}\">${object.user_id.name}</a>\n"
+"       % endif\n"
+"    </p>  \n"
+"    \n"
+"    % if object.paypal_url:\n"
+"    <br/>\n"
+"    <p>It is also possible to directly pay with Paypal:</p>\n"
+"        <a style=\"margin-left: 120px;\" href=\"${object.paypal_url}\">\n"
+"            <img class=\"oe_edi_paypal_button\" "
+"src=\"https://www.paypal.com/en_US/i/btn/btn_paynowCC_LG.gif\"/>\n"
+"        </a>\n"
+"    % endif\n"
+"    \n"
+"    <br/>\n"
+"    <p>If you have any question, do not hesitate to contact us.</p>\n"
+"    <p>Thank you for choosing ${object.company_id.name or 'us'}!</p>\n"
+"    <br/>\n"
+"    <br/>\n"
+"    <div style=\"width: 375px; margin: 0px; padding: 0px; background-color: "
+"#8E0000; border-top-left-radius: 5px 5px; border-top-right-radius: 5px 5px; "
+"background-repeat: repeat no-repeat;\">\n"
+"        <h3 style=\"margin: 0px; padding: 2px 14px; font-size: 12px; color: "
+"#DDD;\">\n"
+"            <strong style=\"text-"
+"transform:uppercase;\">${object.company_id.name}</strong></h3>\n"
+"    </div>\n"
+"    <div style=\"width: 347px; margin: 0px; padding: 5px 14px; line-height: "
+"16px; background-color: #F2F2F2;\">\n"
+"        <span style=\"color: #222; margin-bottom: 5px; display: block; \">\n"
+"        % if object.company_id.street:\n"
+"            ${object.company_id.street}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.street2:\n"
+"            ${object.company_id.street2}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.city or object.company_id.zip:\n"
+"            ${object.company_id.zip} ${object.company_id.city}<br/>\n"
+"        % endif\n"
+"        % if object.company_id.country_id:\n"
+"            ${object.company_id.state_id and ('%s, ' % "
+"object.company_id.state_id.name) or ''} ${object.company_id.country_id.name "
+"or ''}<br/>\n"
+"        % endif\n"
+"        </span>\n"
+"        % if object.company_id.phone:\n"
+"            <div style=\"margin-top: 0px; margin-right: 0px; margin-bottom: "
+"0px; margin-left: 0px; padding-top: 0px; padding-right: 0px; padding-bottom: "
+"0px; padding-left: 0px; \">\n"
+"                Phone:&nbsp; ${object.company_id.phone}\n"
+"            </div>\n"
+"        % endif\n"
+"        % if object.company_id.website:\n"
+"            <div>\n"
+"                Web :&nbsp;<a "
+"href=\"${object.company_id.website}\">${object.company_id.website}</a>\n"
+"            </div>\n"
+"        %endif\n"
+"        <p></p>\n"
+"    </div>\n"
+"</div>\n"
+"            "
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.period:0
@@ -4779,6 +4972,7 @@
 msgstr "Saldo analítico"
 
 #. module: account
+<<<<<<< TREE
 #: help:res.partner,property_payment_term:0
 msgid ""
 "This payment term will be used instead of the default one for sale orders "
@@ -4788,6 +4982,15 @@
 "venta y las facturas de cliente"
 
 #. module: account
+=======
+#: help:res.partner,property_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for sale orders "
+"and customer invoices"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.config.settings:0
 msgid ""
 "If you put \"%(year)s\" in the prefix, it will be replaced by the current "
@@ -4809,11 +5012,19 @@
 msgstr "Asientos validados/asentados"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.move.line,blocked:0
 msgid "No Follow-up"
 msgstr "Sin seguimiento"
 
 #. module: account
+=======
+#: field:account.move.line,blocked:0
+msgid "No Follow-up"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.tax.template:0
 msgid "Search Tax Templates"
 msgstr "Buscar plantillas impuestos"
@@ -4976,11 +5187,19 @@
 msgstr "Tipo cuenta"
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.journal,type:0
 msgid "Bank and Checks"
 msgstr "Banco y cheques"
 
 #. module: account
+=======
+#: selection:account.journal,type:0
+msgid "Bank and Checks"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.account.template,note:0
 msgid "Note"
 msgstr "Nota"
@@ -5100,9 +5319,15 @@
 msgstr "Plan contable"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.invoice,reference_type:0
 msgid "Payment Reference"
 msgstr "Referencia del pago"
+=======
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -5174,11 +5399,19 @@
 msgstr "Apuntes a conciliar"
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.model,name:account.model_account_tax_template
 msgid "Templates for Taxes"
 msgstr "Plantilla para los impuestos"
 
 #. module: account
+=======
+#: model:ir.model,name:account.model_account_tax_template
+msgid "Templates for Taxes"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: sql_constraint:account.period:0
 msgid "The name of the period must be unique per company!"
 msgstr "El nombre del periodo debe ser único por compañia!"
@@ -6311,6 +6544,7 @@
 msgstr "Asientos de pago son la segunda entrada para la conciliación."
 
 #. module: account
+<<<<<<< TREE
 #: help:res.partner,property_supplier_payment_term:0
 msgid ""
 "This payment term will be used instead of the default one for purchase "
@@ -6320,6 +6554,15 @@
 "compra y las facturas de proveedor"
 
 #. module: account
+=======
+#: help:res.partner,property_supplier_payment_term:0
+msgid ""
+"This payment term will be used instead of the default one for purchase "
+"orders and supplier invoices"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.automatic.reconcile,power:0
 msgid ""
 "Number of partial amounts that can be combined to find a balance point can "
@@ -7143,6 +7386,7 @@
 msgstr "Tipo aplicable"
 
 #. module: account
+<<<<<<< TREE
 #: help:account.invoice,date_due:0
 msgid ""
 "If you use payment terms, the due date will be computed automatically at the "
@@ -7157,6 +7401,16 @@
 "quiere forzar una fecha de vencimiento, asegúrese que el plazo de pago no se "
 "establece en la factura. Si deja vacío el plazo de pago y la fecha de "
 "vencimiento, significa pago directo."
+=======
+#: help:account.invoice,date_due:0
+msgid ""
+"If you use payment terms, the due date will be computed automatically at the "
+"generation of accounting entries. The payment term may compute several due "
+"dates, for example 50% now and 50% in one month, but if you want to force a "
+"due date, make sure that the payment term is not set on the invoice. If you "
+"keep the payment term and the due date empty, it means direct payment."
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: code:addons/account/account.py:414
@@ -7399,6 +7653,7 @@
 msgstr "Transacciones de caja"
 
 #. module: account
+<<<<<<< TREE
 #: view:account.unreconcile:0
 msgid ""
 "If you unreconcile transactions, you must also verify all the actions that "
@@ -7408,6 +7663,15 @@
 "están enlazadas con ellas porque no se deshabilitarán"
 
 #. module: account
+=======
+#: view:account.unreconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disabled"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.account.template:0
 #: view:account.bank.statement:0
 #: field:account.bank.statement.line,note:0
@@ -7576,11 +7840,19 @@
 msgstr "Manual"
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Cancel: create refund and reconcile"
 msgstr "Cancelar: crea la factura rectificativa y concilia"
 
 #. module: account
+=======
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Cancel: create refund and reconcile"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: code:addons/account/wizard/account_report_aged_partner_balance.py:58
 #, python-format
 msgid "You must set a start date."
@@ -7794,11 +8066,19 @@
 "Ejemplo: Mi modelo del %(date)s"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.invoice,paypal_url:0
 msgid "Paypal Url"
 msgstr "URL de Paypal"
 
 #. module: account
+=======
+#: field:account.invoice,paypal_url:0
+msgid "Paypal Url"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.config.settings,module_account_voucher:0
 msgid "Manage customer payments"
 msgstr "Gestionar pagos de cliente"
@@ -8499,9 +8779,15 @@
 "baja a la más alta"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.move.line,amount_residual_currency:0
 msgid "Residual Amount in Currency"
 msgstr "Importe residual en la moneda"
+=======
+#: field:account.move.line,amount_residual_currency:0
+msgid "Residual Amount in Currency"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.config.settings,sale_refund_sequence_prefix:0
@@ -8550,6 +8836,7 @@
 msgstr "Cuenta destino"
 
 #. module: account
+<<<<<<< TREE
 #: help:account.invoice.refund,filter_refund:0
 msgid ""
 "Refund base on this type. You can not Modify and Cancel if the invoice is "
@@ -8557,6 +8844,13 @@
 msgstr ""
 "Factura rectificativa basada en este tipo. No puede modificar o cancelar si "
 "la factura ya está conciliada"
+=======
+#: help:account.invoice.refund,filter_refund:0
+msgid ""
+"Refund base on this type. You can not Modify and Cancel if the invoice is "
+"already reconciled"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:account.bank.statement.line,sequence:0
@@ -9127,11 +9421,19 @@
 msgstr "Saldo final"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.journal,centralisation:0
 msgid "Centralized Counterpart"
 msgstr "Contrapartida centralizada"
 
 #. module: account
+=======
+#: field:account.journal,centralisation:0
+msgid "Centralized Counterpart"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.move.line,blocked:0
 msgid ""
 "You can check this box to mark this journal item as a litigation with the "
@@ -9199,12 +9501,21 @@
 msgstr "Tipos de cuentas"
 
 #. module: account
+<<<<<<< TREE
 #: model:email.template,subject:account.email_template_edi_invoice
 msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
 msgstr "${object.company_id.name} Factura (Ref. ${object.number or 'n/a'})"
 
 #. module: account
 #: code:addons/account/account_move_line.py:1211
+=======
+#: model:email.template,subject:account.email_template_edi_invoice
+msgid "${object.company_id.name} Invoice (Ref ${object.number or 'n/a'})"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1211
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid ""
 "You cannot use this general account in this journal, check the tab 'Entry "
@@ -10293,11 +10604,19 @@
 msgstr "No se pueden crear apuntes de compañías diferentes."
 
 #. module: account
+<<<<<<< TREE
 #: model:ir.ui.menu,name:account.menu_finance_periodical_processing
 msgid "Periodic Processing"
 msgstr "Procesamiento periódico"
 
 #. module: account
+=======
+#: model:ir.ui.menu,name:account.menu_finance_periodical_processing
+msgid "Periodic Processing"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.invoice.report:0
 msgid "Customer And Supplier Invoices"
 msgstr "Facturas de cliente y proveedor"
@@ -10372,6 +10691,7 @@
 msgstr "Fecha vencimiento"
 
 #. module: account
+<<<<<<< TREE
 #: model:account.payment.term,name:account.account_payment_term_immediate
 #: model:account.payment.term,note:account.account_payment_term_immediate
 msgid "Immediate Payment"
@@ -10379,6 +10699,15 @@
 
 #. module: account
 #: code:addons/account/account.py:1464
+=======
+#: model:account.payment.term,name:account.account_payment_term_immediate
+#: model:account.payment.term,note:account.account_payment_term_immediate
+msgid "Immediate Payment"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account.py:1464
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid " Centralisation"
 msgstr " Centralización"
@@ -10595,11 +10924,19 @@
 "Esto instala el módulo 'account_budget'."
 
 #. module: account
+<<<<<<< TREE
 #: field:account.bank.statement.line,name:0
 msgid "OBI"
 msgstr "OBI"
 
 #. module: account
+=======
+#: field:account.bank.statement.line,name:0
+msgid "OBI"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:res.partner,property_account_payable:0
 msgid ""
 "This account will be used instead of the default one as the payable account "
@@ -11081,6 +11418,7 @@
 msgstr "¿Cuentas vacías? "
 
 #. module: account
+<<<<<<< TREE
 #: view:account.unreconcile.reconcile:0
 msgid ""
 "If you unreconcile transactions, you must also verify all the actions that "
@@ -11091,6 +11429,16 @@
 
 #. module: account
 #: code:addons/account/account_move_line.py:1059
+=======
+#: view:account.unreconcile.reconcile:0
+msgid ""
+"If you unreconcile transactions, you must also verify all the actions that "
+"are linked to those transactions because they will not be disable"
+msgstr ""
+
+#. module: account
+#: code:addons/account/account_move_line.py:1059
+>>>>>>> MERGE-SOURCE
 #, python-format
 msgid "Unable to change tax!"
 msgstr "¡No se ha podido cambiar el impuesto!"
@@ -11674,11 +12022,19 @@
 msgstr "Cuenta de gastos en plantilla producto"
 
 #. module: account
+<<<<<<< TREE
 #: field:res.partner,property_payment_term:0
 msgid "Customer Payment Term"
 msgstr "Plazo de pago de cliente"
 
 #. module: account
+=======
+#: field:res.partner,property_payment_term:0
+msgid "Customer Payment Term"
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:accounting.report,label_filter:0
 msgid ""
 "This label will be displayed on report to show the balance computed for the "
@@ -11700,6 +12056,7 @@
 msgstr ""
 "El importe residual de un apunte a cobrar o a pagar expresado en su moneda "
 "(puede ser diferente de la moneda de la compañía)."
+<<<<<<< TREE
 
 #, python-format
 #~ msgid "The statement balance is incorrect !\n"
@@ -15923,3 +16280,5 @@
 #, python-format
 #~ msgid "The journal must have default credit and debit account"
 #~ msgstr "El diario debe tener una cuenta acreedora y deudora por defecto."
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/es_AR.po'
--- account/i18n/es_AR.po	2012-12-22 06:07:44 +0000
+++ account/i18n/es_AR.po	2013-01-03 09:27:26 +0000
@@ -1,20 +1,35 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account
+# Spanish (Argentina) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 5.0.0\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-13 15:01+0000\n"
 "Last-Translator: jpdborgna <Unknown>\n"
 "Language-Team: \n"
+=======
+"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"
+"Language-Team: Spanish (Argentina) <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 07:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10875,6 +10890,7 @@
 msgstr ""
 "El importe residual de un apunte a cobrar o a pagar expresado en su moneda "
 "(puede ser diferente de la moneda de la compañía)."
+<<<<<<< TREE
 
 #, python-format
 #~ msgid "Integrity Error !"
@@ -12867,3 +12883,5 @@
 #~ msgid "Invoice '%s' is paid partially: %s%s of %s%s (%s%s remaining)"
 #~ msgstr ""
 #~ "La factura '%s' está parcialmente pagada: %s%s de %s%s (%s%s pendiente)"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/es_CL.po'
--- account/i18n/es_CL.po	2012-12-22 06:07:44 +0000
+++ account/i18n/es_CL.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # Spanish (Chile) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-12-30 18:55+0000\n"
 "Last-Translator: doingit translator <Unknown>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Spanish (Chile) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 07:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10842,6 +10853,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #~ msgid "Accounting Entries-"
 #~ msgstr "Asientos contables -"
@@ -10979,3 +10991,5 @@
 
 #~ msgid "Invoicing Data"
 #~ msgstr "Datos facturación"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/es_CR.po'
--- account/i18n/es_CR.po	2012-12-22 06:07:44 +0000
+++ account/i18n/es_CR.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,36 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* account
+# Spanish (Costa Rica) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-13 15:33+0000\n"
 "Last-Translator: Freddy Gonzalez <[e-mail]>\n"
 "Language-Team: \n"
+=======
+"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"
+"Language-Team: Spanish (Costa Rica) <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
 "Language: \n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 07:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -11128,6 +11143,7 @@
 msgstr ""
 "El monto residual de una línea de asiento por cobrar o por pagar expresado "
 "en su moneda (puede ser diferente de la moneda de la compañía)."
+<<<<<<< TREE
 
 #~ msgid "last month"
 #~ msgstr "el mes pasado"
@@ -15365,3 +15381,5 @@
 #~ "introduciendo la línea de la cuenta de ingresos. OpenERP le propondrá "
 #~ "automáticamente el impuesto asociado a esta cuenta, y la \"cuenta por "
 #~ "cobrar\" de contrapartida."
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/es_DO.po'
--- account/i18n/es_DO.po	2012-12-22 06:07:44 +0000
+++ account/i18n/es_DO.po	2013-01-03 09:27:26 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-11-29 20:54+0000\n"
 "Last-Translator: Jose Ernesto Mendez <[e-mail]>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Spanish (Dominican Republic) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 07:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10824,6 +10835,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #~ msgid "last month"
 #~ msgstr "el mes pasado"
@@ -10867,3 +10879,5 @@
 #~ msgstr ""
 #~ "¡Error de configuración! La moneda elegida debería ser también la misma en "
 #~ "las cuentas por defecto"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/es_EC.po'
--- account/i18n/es_EC.po	2012-12-22 06:07:44 +0000
+++ account/i18n/es_EC.po	2013-01-03 09:27:26 +0000
@@ -1,24 +1,33 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR Free Software Foundation, Inc.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Spanish (Ecuador) translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 05:27+0000\n"
 "Last-Translator: Christopher Ormaza - (Ecuadorenlinea.net) "
 "<[e-mail]>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Spanish (Ecuador) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 07:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -11134,6 +11143,7 @@
 msgstr ""
 "El importe residual de un apunte a cobrar o a pagar expresado en su moneda "
 "(puede ser diferente de la moneda de la compañía)."
+<<<<<<< TREE
 
 #~ msgid "Entries Encoding"
 #~ msgstr "Codificación asientos"
@@ -15215,3 +15225,5 @@
 #, python-format
 #~ msgid "New currency is not configured properly !"
 #~ msgstr "¡La nueva moneda no está configurada correctamente!"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/es_MX.po'
--- account/i18n/es_MX.po	2012-12-22 06:07:44 +0000
+++ account/i18n/es_MX.po	2013-01-03 09:27:26 +0000
@@ -7,15 +7,25 @@
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-15 22:29+0000\n"
+=======
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 23:00+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Mexico) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 07:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0

=== modified file 'account/i18n/es_PY.po'
--- account/i18n/es_PY.po	2012-12-22 06:07:44 +0000
+++ account/i18n/es_PY.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,31 @@
 # Spanish (Paraguay) translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-02 18:59+0000\n"
+=======
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 23:00+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Spanish (Paraguay) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 07:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -11036,6 +11046,7 @@
 msgstr ""
 "El importe residual de un apunte a cobrar o a pagar expresado en su moneda "
 "(puede ser diferente de la moneda de la compañía)."
+<<<<<<< TREE
 
 #, python-format
 #~ msgid ""
@@ -13239,3 +13250,5 @@
 
 #~ msgid "JNRL"
 #~ msgstr "JNRL"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/es_UY.po'
--- account/i18n/es_UY.po	2012-12-22 06:07:44 +0000
+++ account/i18n/es_UY.po	2013-01-03 09:27:26 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-08-14 15:07+0000\n"
 "Last-Translator: Juan Andres Martinez Chaine <Unknown>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Spanish (Uruguay) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 07:01+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10844,6 +10855,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #~ msgid "last month"
 #~ msgstr "el mes pasado"
@@ -11180,3 +11192,5 @@
 #~ msgstr ""
 #~ "Nota de Crédito basada en este tipo. No puede modificar y cancelar si la "
 #~ "factura ya está conciliada."
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/es_VE.po'
--- account/i18n/es_VE.po	2012-12-22 06:07:44 +0000
+++ account/i18n/es_VE.po	2013-01-03 09:27:26 +0000
@@ -7,15 +7,26 @@
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-02-08 02:23+0000\n"
 "Last-Translator: Nhomar - Vauxoo <[e-mail]>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Spanish (Venezuela) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:36+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 07:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10820,6 +10831,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #~ msgid "last month"
 #~ msgstr "el último mes"
@@ -10911,3 +10923,5 @@
 #~ msgstr ""
 #~ "Marque esta opción si desea que no aparezca en las facturas ningún IVA "
 #~ "relacionado con este código de impuesto."
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/et.po'
--- account/i18n/et.po	2012-12-22 06:07:44 +0000
+++ account/i18n/et.po	2013-01-03 09:27:26 +0000
@@ -1,20 +1,33 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account
+# Estonian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-21 20:57+0000\n"
+=======
+"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-01-02 20:59+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Ahti Hinnov <[e-mail]>\n"
-"Language-Team: \n"
+"Language-Team: Estonian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:29+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2013-01-03 05:38+0000\n"
+"X-Generator: Launchpad (build 16393)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -546,7 +559,7 @@
 #: help:account.vat.declaration,chart_account_id:0
 #: help:accounting.report,chart_account_id:0
 msgid "Select Charts of Accounts"
-msgstr "Vali Kontode graafikud"
+msgstr "Vali kontoplaan"
 
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
@@ -567,7 +580,7 @@
 #: report:account.general.ledger:0
 #: report:account.general.ledger_landscape:0
 msgid "Counterpart"
-msgstr ""
+msgstr "Vastaspool"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -691,7 +704,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_common_partner_report
 msgid "Account Common Partner Report"
-msgstr "Konto tava \"Partner\" aruanne"
+msgstr ""
 
 #. module: account
 #: field:account.fiscalyear.close,period_id:0
@@ -731,6 +744,11 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "Configure your company bank accounts"
+msgstr "Seadista oma ettevõtte pangakontod"
+
+#. module: account
+#: view:account.invoice.refund:0
+msgid "Create Refund"
 msgstr ""
 
 #. module: account
@@ -1143,7 +1161,7 @@
 #. module: account
 #: help:account.fiscalyear.close,fy_id:0
 msgid "Select a Fiscal year to close"
-msgstr "Vali eelarve aasta mida sulgeda"
+msgstr "Vali majandusaasta mida sulgeda"
 
 #. module: account
 #: help:account.account.template,user_type:0
@@ -1178,7 +1196,7 @@
 #: model:ir.actions.act_window,name:account.action_view_bank_statement_tree
 #: model:ir.ui.menu,name:account.journal_cash_move_lines
 msgid "Cash Registers"
-msgstr "Raha register"
+msgstr "Kassaraamat"
 
 #. module: account
 #: field:account.config.settings,sale_refund_journal_id:0
@@ -1317,7 +1335,7 @@
 #: report:account.third_party_ledger:0
 #: report:account.third_party_ledger_other:0
 msgid "Entry Label"
-msgstr "Kirje silt"
+msgstr "Kirje pealkiri"
 
 #. module: account
 #: help:account.invoice,origin:0
@@ -1412,12 +1430,12 @@
 #: model:account.financial.report,name:account.account_financial_report_profitandloss0
 #: model:ir.actions.act_window,name:account.action_account_report_pl
 msgid "Profit and Loss"
-msgstr ""
+msgstr "Kasum ja kahjum"
 
 #. module: account
 #: model:ir.model,name:account.model_account_account_template
 msgid "Templates for Accounts"
-msgstr "Mallid kontodele"
+msgstr ""
 
 #. module: account
 #: view:account.tax.code.template:0
@@ -2037,7 +2055,7 @@
 #. module: account
 #: sql_constraint:account.move.line:0
 msgid "Wrong credit or debit value in accounting entry !"
-msgstr ""
+msgstr "Vale kreedit- või deebetväärtus raamatupidamiskirjendil!"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -2172,7 +2190,7 @@
 #. module: account
 #: view:account.fiscalyear.close.state:0
 msgid "Close Fiscal Year"
-msgstr ""
+msgstr "Sulge majandusaasta"
 
 #. module: account
 #. openerp-web
@@ -2326,7 +2344,7 @@
 #. module: account
 #: model:process.node,name:account.process_node_importinvoice0
 msgid "Import from invoice"
-msgstr ""
+msgstr "Impordi arvest"
 
 #. module: account
 #: selection:account.entries.report,month:0
@@ -2513,7 +2531,7 @@
 #: help:accounting.report,fiscalyear_id:0
 #: help:accounting.report,fiscalyear_id_cmp:0
 msgid "Keep empty for all open fiscal year"
-msgstr "Jäta tühjaks kõigi avatud majandusaastate joks"
+msgstr "Jäta tühjaks kõigi avatud majandusaastate jaoks"
 
 #. module: account
 #: code:addons/account/account.py:653
@@ -2796,7 +2814,7 @@
 #: model:ir.ui.menu,name:account.menu_action_account_form
 #: model:ir.ui.menu,name:account.menu_analytic
 msgid "Accounts"
-msgstr ""
+msgstr "Kontod"
 
 #. module: account
 #: code:addons/account/account.py:3493
@@ -3173,7 +3191,7 @@
 #. module: account
 #: model:ir.ui.menu,name:account.menu_account_report_pl
 msgid "Profit And Loss"
-msgstr ""
+msgstr "Kasum ja kahjum"
 
 #. module: account
 #: view:account.fiscal.position:0
@@ -3239,7 +3257,7 @@
 #: view:account.config.settings:0
 #: view:account.installer:0
 msgid "Date Range"
-msgstr ""
+msgstr "Kuupäevade vahemik"
 
 #. module: account
 #: view:account.period:0
@@ -3360,7 +3378,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Proforma Invoices"
-msgstr ""
+msgstr "Proforma arved"
 
 #. module: account
 #: model:process.node,name:account.process_node_electronicfile0
@@ -3839,7 +3857,7 @@
 #: view:account.invoice.report:0
 #: field:account.invoice.report,categ_id:0
 msgid "Category of Product"
-msgstr ""
+msgstr "Toote kategooria"
 
 #. module: account
 #: code:addons/account/account.py:930
@@ -4023,12 +4041,12 @@
 #: view:account.invoice.report:0
 #: model:res.groups,name:account.group_proforma_invoices
 msgid "Pro-forma Invoices"
-msgstr ""
+msgstr "Pro-forma arved"
 
 #. module: account
 #: view:res.partner:0
 msgid "History"
-msgstr ""
+msgstr "Ajalugu"
 
 #. module: account
 #: help:account.tax,applicable_type:0
@@ -5012,7 +5030,7 @@
 #: view:validate.account.move:0
 #: view:validate.account.move.lines:0
 msgid "or"
-msgstr ""
+msgstr "või"
 
 #. module: account
 #: view:account.invoice.report:0
@@ -5309,7 +5327,7 @@
 #. module: account
 #: field:account.subscription.line,move_id:0
 msgid "Entry"
-msgstr "Kirje"
+msgstr "Lausend"
 
 #. module: account
 #: field:account.tax,python_compute_inv:0
@@ -5374,7 +5392,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Pro Forma Invoice "
-msgstr ""
+msgstr "Pro Forma arve "
 
 #. module: account
 #: selection:account.subscription,period_type:0
@@ -5398,7 +5416,7 @@
 #: model:ir.actions.act_window,name:account.action_account_report_bs
 #: model:ir.ui.menu,name:account.menu_account_report_bs
 msgid "Balance Sheet"
-msgstr ""
+msgstr "Bilanss"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -5481,7 +5499,7 @@
 #: code:addons/account/wizard/account_fiscalyear_close.py:41
 #, python-format
 msgid "End of Fiscal Year Entry"
-msgstr "Majandusaasta lõpp"
+msgstr ""
 
 #. module: account
 #: model:process.transition,name:account.process_transition_customerinvoice0
@@ -6707,7 +6725,7 @@
 #. module: account
 #: field:account.bank.statement,move_line_ids:0
 msgid "Entry lines"
-msgstr "Kirje read"
+msgstr "Lausendi read"
 
 #. module: account
 #: field:account.move.line,centralisation:0
@@ -6930,7 +6948,7 @@
 #. module: account
 #: model:process.transition.action,name:account.process_transition_action_createentries0
 msgid "Create entry"
-msgstr "Loo kirje"
+msgstr "Loo lausend"
 
 #. module: account
 #: selection:account.account.type,report_type:0
@@ -7946,7 +7964,7 @@
 #: selection:account.config.settings,period:0
 #: selection:account.installer,period:0
 msgid "Monthly"
-msgstr ""
+msgstr "Igakuine"
 
 #. module: account
 #: model:account.account.type,name:account.data_account_type_asset
@@ -8495,7 +8513,7 @@
 #. module: account
 #: view:account.config.settings:0
 msgid "Apply"
-msgstr ""
+msgstr "Kinnita"
 
 #. module: account
 #: field:account.financial.report,account_type_ids:0
@@ -9033,7 +9051,7 @@
 #: field:account.invoice,move_lines:0
 #: field:account.move.reconcile,line_id:0
 msgid "Entry Lines"
-msgstr "Kirje read"
+msgstr "Lausendi read"
 
 #. module: account
 #: model:ir.actions.act_window,name:account.action_open_journal_button
@@ -9082,7 +9100,7 @@
 #. module: account
 #: model:process.node,note:account.process_node_bankstatement0
 msgid "Registered payment"
-msgstr ""
+msgstr "Registreeritud makse"
 
 #. module: account
 #: view:account.fiscalyear.close.state:0
@@ -9721,7 +9739,7 @@
 #. module: account
 #: view:account.installer:0
 msgid "Configure your Fiscal Year"
-msgstr ""
+msgstr "Seadista majandusaasta"
 
 #. module: account
 #: field:account.period,name:0
@@ -10827,6 +10845,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #, python-format
 #~ msgid "Supplier invoice"
@@ -11903,3 +11922,5 @@
 
 #~ msgid "Image"
 #~ msgstr "Pilt"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/eu.po'
--- account/i18n/eu.po	2012-12-22 06:07:44 +0000
+++ account/i18n/eu.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # Basque translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:48+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Basque <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:28+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:54+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10820,21 +10831,3 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
-
-#~ msgid "Entries Encoding"
-#~ msgstr "Kontularitza Jartzapen Sarrerak (Codificación de asientos)"
-
-#~ msgid "Unpaid Supplier Invoices"
-#~ msgstr "Hornitzaileen Ordaindu Gabeko Fakturak"
-
-#~ msgid "Confirm statement from draft"
-#~ msgstr "Zirriborrotik kontu-laburpena baieztatu"
-
-#~ msgid "Select Message"
-#~ msgstr "Mezua aurkeratu"
-
-#~ msgid "Reconciliation result"
-#~ msgstr "Emaitzen adiskidetza"
-
-#~ msgid "Print Taxes Report"
-#~ msgstr "Inprimatu zerga-txostena"

=== modified file 'account/i18n/fa.po'
--- account/i18n/fa.po	2012-12-22 06:07:44 +0000
+++ account/i18n/fa.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # Persian translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2009-09-08 14:12+0000\n"
 "Last-Translator: Samarian <[e-mail]>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Persian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:32+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:57+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10820,6 +10831,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #~ msgid "Confirm draft invoices"
 #~ msgstr "تاييد فاكتورهاي پيش نويس"
@@ -10841,3 +10853,5 @@
 
 #~ msgid "State"
 #~ msgstr "وضعیت‌"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/fa_AF.po'
--- account/i18n/fa_AF.po	2012-12-22 06:07:44 +0000
+++ account/i18n/fa_AF.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,31 @@
 # Dari Persian translation for openobject-addons
-# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-03-10 07:28+0000\n"
+=======
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 23:00+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Dari Persian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:37+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 07:02+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0

=== modified file 'account/i18n/fi.po'
--- account/i18n/fi.po	2012-12-22 06:07:44 +0000
+++ account/i18n/fi.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # Finnish translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:55+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\n"
+=======
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 23:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Finnish <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:55+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10869,6 +10880,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #~ msgid "Select Message"
 #~ msgstr "Valitse viesti"
@@ -13246,3 +13258,5 @@
 
 #~ msgid "Example"
 #~ msgstr "Esim."
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/fr.po'
--- account/i18n/fr.po	2012-12-22 06:07:44 +0000
+++ account/i18n/fr.po	2013-01-03 09:27:26 +0000
@@ -1,86 +1,36 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* account
+# French translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-21 14:36+0000\n"
 "Last-Translator: Florian Hatat <Unknown>\n"
 "Language-Team: \n"
+=======
+"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-24 10:59+0000\n"
+"Last-Translator: Fabien (Open ERP) <[e-mail]>\n"
+"Language-Team: French <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-25 05:15+0000\n"
+>>>>>>> MERGE-SOURCE
 "X-Generator: Launchpad (build 16378)\n"
 
 #. module: account
-#: code:addons/account/wizard/account_fiscalyear_close.py:41
-#, python-format
-msgid "End of Fiscal Year Entry"
-msgstr "Ecriture de fin d'exercice comptable"
-
-#. module: account
-#: code:addons/account/wizard/account_move_bank_reconcile.py:49
-#, python-format
-msgid ""
-"You have to define the bank account\n"
-"in the journal definition for reconciliation."
-msgstr ""
-"Vous devez définir le compte bancaire\n"
-"dans la définition du journal pour le rapprochement."
-
-#, python-format
-#~ msgid "The opening journal must not have any entry in the new fiscal year !"
-#~ msgstr ""
-#~ "Le journal d'ouverture ne doit pas contenir d'écriture dans le nouvel "
-#~ "exercice !"
-
-#~ msgid "Close Fiscal Year with new entries"
-#~ msgstr "Clôturer l'exercice fiscal avec de nouvelles écritures"
-
-#~ msgid "(Keep empty for all open fiscal years)"
-#~ msgstr "(laisser vide pour tous les exercices fiscaux ouverts)"
-
-#~ msgid " Close states of Fiscal year and periods"
-#~ msgstr " Clôturer les états de l'exercice fiscal et des périodes"
-
-#, python-format
-#~ msgid ""
-#~ "No period defined for this date !\n"
-#~ "Please create a fiscal year."
-#~ msgstr ""
-#~ "Aucune période définie pour cette date !\n"
-#~ "Veuillez créer un exercice fiscal."
-
-#, python-format
-#~ msgid "Closing of fiscal year cancelled, please check the box !"
-#~ msgstr "Clôture de l'exercice fiscal annulé, veuillez cocher la case !"
-
-#, python-format
-#~ msgid ""
-#~ "No fiscal year defined for this date !\n"
-#~ "Please create one."
-#~ msgstr ""
-#~ "Aucun exercice comptable défini pour cette date !\n"
-#~ "Veuillez en créer un."
-
-#, python-format
-#~ msgid "You can not delete posted movement: \"%s\"!"
-#~ msgstr "Vous ne pouvez pas supprimer l'écriture comptabilisée : \"%s\" !"
-
-#, python-format
-#~ msgid "You can not add/modify entries in a closed journal."
-#~ msgstr ""
-#~ "Vous ne pouvez pas ajouter/modifier des écritures dans un journal cloturé."
-
-#, python-format
-#~ msgid "Some entries are already reconciled !"
-#~ msgstr "Certaines écritures sont déjà lettrées !"
-
-#. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
 msgid "System payment"
 msgstr "Règlement enregistré dans le système"
@@ -319,11 +269,19 @@
 msgstr "Rapports belges"
 
 #. module: account
+<<<<<<< TREE
 #: model:mail.message.subtype,name:account.mt_invoice_validated
 msgid "Validated"
 msgstr ""
 
 #. module: account
+=======
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr "Validé"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
 msgstr "Vue des revenus"
@@ -5753,6 +5711,12 @@
 msgstr "Montant"
 
 #. module: account
+#: code:addons/account/wizard/account_fiscalyear_close.py:41
+#, python-format
+msgid "End of Fiscal Year Entry"
+msgstr "Ecriture de fin d'exercice comptable"
+
+#. module: account
 #: model:process.transition,name:account.process_transition_customerinvoice0
 #: model:process.transition,name:account.process_transition_paymentorderreconcilation0
 #: model:process.transition,name:account.process_transition_statemententries0
@@ -9874,6 +9838,16 @@
 msgstr "Date du jour"
 
 #. module: account
+#: code:addons/account/wizard/account_move_bank_reconcile.py:49
+#, python-format
+msgid ""
+"You have to define the bank account\n"
+"in the journal definition for reconciliation."
+msgstr ""
+"Vous devez définir le compte bancaire\n"
+"dans la définition du journal pour le rapprochement."
+
+#. module: account
 #: help:account.journal,sequence_id:0
 msgid ""
 "This field contains the information related to the numbering of the journal "
@@ -11286,6 +11260,7 @@
 msgstr ""
 "Le solde dû sur un compte de tiers est exprimée dans la devise du journal "
 "(peut être différente de la devise de la société)"
+<<<<<<< TREE
 
 #~ msgid "Aged Trial Balance"
 #~ msgstr "Balance Agée"
@@ -15430,3 +15405,5 @@
 #~ "Un écriture est composée de plusieurs lignes, chacune étant soit un débit "
 #~ "soit un crédit. OpenERP crée automatiquement une écriture par document "
 #~ "comptable : facture, avoir, paiement de fournisseur, relevés bancaires, etc."
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/fr_BE.po'
--- account/i18n/fr_BE.po	2012-12-22 06:07:44 +0000
+++ account/i18n/fr_BE.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # French (Belgium) translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2010-12-29 11:36+0000\n"
 "Last-Translator: Olivier Dony (OpenERP) <Unknown>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: French (Belgium) <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:35+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 07:00+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10820,14 +10831,3 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
-
-#~ msgid ""
-#~ "Cancel Invoice: Creates the refund invoice, validate and reconcile it to "
-#~ "cancel the current invoice."
-#~ msgstr ""
-#~ "Annuler la facture : crée, valide et rapproche une note de crédit pour "
-#~ "annuler la facture actuelle."
-
-#~ msgid "Refund Invoice: Creates the refund invoice, ready for editing."
-#~ msgstr ""
-#~ "Note de crédit: crée la note de crédit brouillon, prête à être modifiée"

=== modified file 'account/i18n/gl.po'
--- account/i18n/gl.po	2012-12-22 06:07:44 +0000
+++ account/i18n/gl.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # Galician translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-05-10 17:59+0000\n"
 "Last-Translator: Raphael Collet (OpenERP) <Unknown>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Galician <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10915,6 +10926,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #~ msgid "Select Message"
 #~ msgstr "Seleccionar mensaxe"
@@ -12219,3 +12231,5 @@
 #~ "Seleccione aquí o tipo de valoración relacionada con esta línea de plazo de "
 #~ "pago. Teña en conta que debe ter a última lña co tipo 'Saldo' para "
 #~ "garantizar que o importe total sexa procesado."
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/gu.po'
--- account/i18n/gu.po	2012-12-22 06:07:44 +0000
+++ account/i18n/gu.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # Gujarati translation for openobject-addons
-# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-10-17 04:15+0000\n"
 "Last-Translator: Amit Rasmiya (OpenERP) <Unknown>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Gujarati <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10820,6 +10831,7 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
+<<<<<<< TREE
 
 #~ msgid "OK"
 #~ msgstr "બરાબર"
@@ -10954,3 +10966,5 @@
 
 #~ msgid "account.tax"
 #~ msgstr "ખાતુ.વેરો"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/he.po'
--- account/i18n/he.po	2012-12-22 06:07:44 +0000
+++ account/i18n/he.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # Hebrew translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2011-06-19 07:00+0000\n"
 "Last-Translator: Natan Alter <Unknown>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Hebrew <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10820,12 +10831,3 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
-
-#~ msgid "Negative"
-#~ msgstr "שלילי"
-
-#~ msgid "Origin"
-#~ msgstr "מקור"
-
-#~ msgid "Other Configuration"
-#~ msgstr "תצורה אחרת"

=== modified file 'account/i18n/hi.po'
--- account/i18n/hi.po	2012-12-22 06:07:44 +0000
+++ account/i18n/hi.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # Hindi translation for openobject-addons
-# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-04-03 07:14+0000\n"
 "Last-Translator: Vibhav Pant <[e-mail]>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Hindi <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:30+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10820,61 +10831,3 @@
 "The residual amount on a receivable or payable of a journal entry expressed "
 "in its currency (maybe different of the company currency)."
 msgstr ""
-
-#, python-format
-#~ msgid "You can not delete posted movement: \"%s\"!"
-#~ msgstr "आप पोस्ट आंदोलन को नष्ट नहीं कर सकते हैं: \"% s\"!"
-
-#~ msgid "Account currency"
-#~ msgstr "खाता की मुद्रा"
-
-#~ msgid "Children Definition"
-#~ msgstr "बच्चों की परिभाषा"
-
-#~ msgid "Other Configuration"
-#~ msgstr "अन्‍य विन्यास"
-
-#, python-format
-#~ msgid ""
-#~ "You cannot remove/deactivate an account which is set as a property to any "
-#~ "Partner."
-#~ msgstr ""
-#~ "पार्टनर की संपति के रूप में परिभाषित खाता को निरस्त या हटाया नहीं जा सकता"
-
-#, python-format
-#~ msgid "No journal for ending writing has been defined for the fiscal year"
-#~ msgstr "वितीय वर्ष की समाप्ति के लिए जोर्नल परिभाषित नहीं है"
-
-#~ msgid "Voucher Management"
-#~ msgstr "वाउचर प्रबंधन"
-
-#~ msgid "Accounting Entries-"
-#~ msgstr "लेखा प्रविष्टियों"
-
-#~ msgid "Negative"
-#~ msgstr "ऋणात्मक"
-
-#~ msgid "Origin"
-#~ msgstr "मूल"
-
-#, python-format
-#~ msgid "Journal: %s"
-#~ msgstr "जर्नल: %s"
-
-#~ msgid "St."
-#~ msgstr "स्टo"
-
-#~ msgid "Field Name"
-#~ msgstr "फ़ील्ड का नाम"
-
-#~ msgid "Configure"
-#~ msgstr "तैयार करो"
-
-#~ msgid "Positive"
-#~ msgstr "धनात्मक"
-
-#~ msgid "last month"
-#~ msgstr "पहले का महिना"
-
-#~ msgid "All Analytic Entries"
-#~ msgstr "सभी विश्लेषणात्मक प्रविष्टियाँ"

=== modified file 'account/i18n/hr.po'
--- account/i18n/hr.po	2012-12-22 06:07:44 +0000
+++ account/i18n/hr.po	2013-01-03 09:27:26 +0000
@@ -1,20 +1,35 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* account
+# Croatian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-13 14:32+0000\n"
 "Last-Translator: Velimir Valjetic <[e-mail]>\n"
 "Language-Team: \n"
+=======
+"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"
+"Language-Team: Croatian <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:33+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:58+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10986,6 +11001,7 @@
 msgstr ""
 "Ostatak iznosa dugovanja ili potraživanja u svojoj valuti (ne nužno valuti "
 "organizacije)."
+<<<<<<< TREE
 
 #~ msgid "Select Message"
 #~ msgstr "Odaberite poruku"
@@ -14209,3 +14225,5 @@
 #~ "Molimo provjerite iznose na računu!\n"
 #~ "Ukupan iznos računa se ne slaže sa izračunatom vrijednošću.\n"
 #~ "Provjerite polje \"Kontrola uk. iznosa\", stavke računa i poreze."
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/hu.po'
--- account/i18n/hu.po	2012-12-28 05:11:44 +0000
+++ account/i18n/hu.po	2013-01-03 09:27:26 +0000
@@ -1,20 +1,35 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-# 	* account
+# Hungarian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-27 22:48+0000\n"
 "Last-Translator: Balint (eSolve) <Unknown>\n"
 "Language-Team: \n"
+=======
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-12-21 17:04+0000\n"
+"PO-Revision-Date: 2012-12-21 23:00+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hungarian <[e-mail]>\n"
+>>>>>>> MERGE-SOURCE
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-28 05:11+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -367,9 +382,15 @@
 #: view:account.invoice.report:0
 #: field:account.invoice.report,user_id:0
 msgid "Salesperson"
+<<<<<<< TREE
 msgstr "Értékesítő"
 
 #. module: account
+=======
+msgstr ""
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.bank.statement:0
 #: view:account.invoice:0
 msgid "Responsible"
@@ -2759,9 +2780,15 @@
 "azonnal, 50% 1 hónap múlva."
 
 #. module: account
+<<<<<<< TREE
 #: field:account.config.settings,purchase_sequence_next:0
 msgid "Next supplier invoice number"
 msgstr "Következő szállítói számlaszám"
+=======
+#: field:account.config.settings,purchase_sequence_next:0
+msgid "Next supplier invoice number"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.analytic.cost.ledger.journal.report:0
@@ -4730,9 +4757,15 @@
 msgstr "Számlatükör"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.invoice,reference_type:0
 msgid "Payment Reference"
 msgstr "Átutalási hivatkozás"
+=======
+#: field:account.invoice,reference_type:0
+msgid "Payment Reference"
+msgstr ""
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: selection:account.financial.report,style_overwrite:0
@@ -10997,6 +11030,7 @@
 msgstr ""
 "A könyvelési tételben lévő vevőkövetelés vagy szállítói tartozás rendezetlen "
 "devizaösszege (eltérhet a vállalat pénznemétől)."
+<<<<<<< TREE
 
 #, python-format
 #~ msgid "Supplier invoice"
@@ -13451,3 +13485,5 @@
 
 #~ msgid "The company name must be unique !"
 #~ msgstr "A vállalkozás nevének egyedinek kell lennie !"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/id.po'
--- account/i18n/id.po	2012-12-22 06:07:44 +0000
+++ account/i18n/id.po	2013-01-03 09:27:26 +0000
@@ -1,21 +1,32 @@
 # Indonesian translation for openobject-addons
-# Copyright (c) 2008 Rosetta Contributors and Canonical Ltd 2008
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
 # This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2008.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+<<<<<<< TREE
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-15 11:28+0000\n"
 "Last-Translator: Riza Kurniawan <[e-mail]>\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"
+>>>>>>> MERGE-SOURCE
 "Language-Team: Indonesian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:31+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2012-12-22 06:56+0000\n"
+"X-Generator: Launchpad (build 16378)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -10909,6 +10920,7 @@
 msgstr ""
 "Jumlah residual pada piutang / hutang dari catatan jurnal dinyatakan dalam "
 "mata uang (mungkin berbeda dari mata uang perusahaan)."
+<<<<<<< TREE
 
 #~ msgid "Accounting Properties"
 #~ msgstr "Properties Akutansi"
@@ -12112,3 +12124,5 @@
 #~ msgid ""
 #~ "You selected an Unit of Measure which is not compatible with the product."
 #~ msgstr "Anda Memilih satuan yang tidak kompatibel dengan productnya"
+=======
+>>>>>>> MERGE-SOURCE

=== modified file 'account/i18n/it.po'
--- account/i18n/it.po	2012-12-22 06:07:44 +0000
+++ account/i18n/it.po	2013-01-03 09:27:26 +0000
@@ -1,20 +1,33 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* account
+# Italian translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
 #
 msgid ""
 msgstr ""
+<<<<<<< TREE
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: [e-mail]\n"
 "POT-Creation-Date: 2012-12-21 17:04+0000\n"
 "PO-Revision-Date: 2012-12-20 23:58+0000\n"
+=======
+"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-01-02 23:00+0000\n"
+>>>>>>> MERGE-SOURCE
 "Last-Translator: Sergio Corato <Unknown>\n"
-"Language-Team: \n"
+"Language-Team: Italian <[e-mail]>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+<<<<<<< TREE
 "X-Launchpad-Export-Date: 2012-12-22 05:31+0000\n"
 "X-Generator: Launchpad (build 16378)\n"
+=======
+"X-Launchpad-Export-Date: 2013-01-03 05:38+0000\n"
+"X-Generator: Launchpad (build 16393)\n"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: model:process.transition,name:account.process_transition_supplierreconcilepaid0
@@ -257,11 +270,19 @@
 msgstr "Reports belgi"
 
 #. module: account
+<<<<<<< TREE
 #: model:mail.message.subtype,name:account.mt_invoice_validated
 msgid "Validated"
 msgstr ""
 
 #. module: account
+=======
+#: model:mail.message.subtype,name:account.mt_invoice_validated
+msgid "Validated"
+msgstr "Confermato"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:account.account.type,name:account.account_type_income_view1
 msgid "Income View"
 msgstr "Vista Ricavi"
@@ -430,7 +451,7 @@
 #. module: account
 #: selection:account.journal,type:0
 msgid "Purchase Refund"
-msgstr "Rimborso acquisti"
+msgstr "Nota di Credito su Acquisti"
 
 #. module: account
 #: selection:account.journal,type:0
@@ -473,11 +494,19 @@
 "dei Conti, ...)"
 
 #. module: account
+<<<<<<< TREE
 #: help:account.bank.statement.line,name:0
 msgid "Originator to Beneficiary Information"
 msgstr ""
 
 #. module: account
+=======
+#: help:account.bank.statement.line,name:0
+msgid "Originator to Beneficiary Information"
+msgstr "Originator to Beneficiary Information"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #. openerp-web
 #: code:addons/account/static/src/xml/account_move_line_quickadd.xml:8
 #, python-format
@@ -493,11 +522,20 @@
 msgstr "Template del piano dei conti"
 
 #. module: account
-#: selection:account.invoice.refund,filter_refund:0
-msgid "Modify: create refund, reconcile and create a new draft invoice"
-msgstr ""
-
-#. module: account
+<<<<<<< TREE
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+
+#. module: account
+=======
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Modify: create refund, reconcile and create a new draft invoice"
+msgstr ""
+"Modifica: crea una nota di credito, riconcilia e crea una nuova fattura bozza"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: help:account.config.settings,tax_calculation_rounding_method:0
 msgid ""
 "If you select 'Round per line' : for each tax, the tax amount will first be "
@@ -615,7 +653,7 @@
 #. module: account
 #: model:ir.model,name:account.model_account_invoice_refund
 msgid "Invoice Refund"
-msgstr "Rimborso fattura"
+msgstr "Nota di Credito"
 
 #. module: account
 #: report:account.overdue:0
@@ -808,11 +846,19 @@
 msgstr "Configura i conti bancari per la tua azienda"
 
 #. module: account
+<<<<<<< TREE
 #: view:account.invoice.refund:0
 msgid "Create Refund"
 msgstr ""
 
 #. module: account
+=======
+#: view:account.invoice.refund:0
+msgid "Create Refund"
+msgstr "Crea nota di credito"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: constraint:account.move.line:0
 msgid ""
 "The date of your Journal Entry is not in the defined period! You should "
@@ -837,12 +883,21 @@
 msgstr "Sei sicuro di voler creare la voce?"
 
 #. module: account
+<<<<<<< TREE
 #: code:addons/account/account_invoice.py:1329
 #, python-format
 msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
 msgstr ""
 
 #. module: account
+=======
+#: code:addons/account/account_invoice.py:1329
+#, python-format
+msgid "Invoice partially paid: %s%s of %s%s (%s%s remaining)."
+msgstr "Fattura parzialmente pagata: %s%s di %s%s (%s%s rimanente)."
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.invoice:0
 msgid "Print Invoice"
 msgstr "Stampa Fattura"
@@ -1061,9 +1116,15 @@
 msgstr "Sezionale Acquisti"
 
 #. module: account
+<<<<<<< TREE
 #: model:mail.message.subtype,description:account.mt_invoice_paid
 msgid "Invoice paid"
 msgstr ""
+=======
+#: model:mail.message.subtype,description:account.mt_invoice_paid
+msgid "Invoice paid"
+msgstr "Fattura pagata"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:validate.account.move:0
@@ -1117,7 +1178,7 @@
 #. module: account
 #: selection:account.journal,type:0
 msgid "Sale Refund"
-msgstr "Rimborso vendite"
+msgstr "Nota di Credito su Vendite"
 
 #. module: account
 #: model:process.node,note:account.process_node_accountingstatemententries0
@@ -1267,7 +1328,7 @@
 #. module: account
 #: view:account.invoice:0
 msgid "Refund "
-msgstr "Rimborso "
+msgstr "Nota di Credito "
 
 #. module: account
 #: code:addons/account/account_analytic_line.py:90
@@ -1957,12 +2018,21 @@
 msgstr "Vendite per tipo di conto"
 
 #. module: account
+<<<<<<< TREE
 #: model:account.payment.term,name:account.account_payment_term_15days
 #: model:account.payment.term,note:account.account_payment_term_15days
 msgid "15 Days"
 msgstr ""
 
 #. module: account
+=======
+#: model:account.payment.term,name:account.account_payment_term_15days
+#: model:account.payment.term,note:account.account_payment_term_15days
+msgid "15 Days"
+msgstr "15 giorni"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: model:ir.ui.menu,name:account.periodical_processing_invoicing
 msgid "Invoicing"
 msgstr "Fatturazione"
@@ -2103,11 +2173,19 @@
 msgstr "Registrazione in 'Bozza'"
 
 #. module: account
+<<<<<<< TREE
 #: model:mail.message.subtype,description:account.mt_invoice_validated
 msgid "Invoice validated"
 msgstr ""
 
 #. module: account
+=======
+#: model:mail.message.subtype,description:account.mt_invoice_validated
+msgid "Invoice validated"
+msgstr "Fattura validata"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.config.settings,module_account_check_writing:0
 msgid "Pay your suppliers by check"
 msgstr "Pagamento dei fornitori tramite assegno"
@@ -2288,8 +2366,6 @@
 "bancario.\n"
 "                Dovresti riceverlo periodicamente dalla tua banca.\n"
 "              </p><p>\n"
-"                OpenERP allows you to reconcile a statement line directly "
-"with\n"
 "                OpenERP consente di riconciliare una riga dell'estratto "
 "conto direttamente con\n"
 "                le fatture di vendita o acquisto relative.\n"
@@ -2838,11 +2914,19 @@
 msgstr "Proprietà dell'account"
 
 #. module: account
+<<<<<<< TREE
 #: selection:account.invoice.refund,filter_refund:0
 msgid "Create a draft refund"
 msgstr ""
 
 #. module: account
+=======
+#: selection:account.invoice.refund,filter_refund:0
+msgid "Create a draft refund"
+msgstr "Crea una nota di credito bozza"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: view:account.partner.reconcile.process:0
 msgid "Partner Reconciliation"
 msgstr "Riconciliazione per il partner"
@@ -3390,10 +3474,17 @@
 "legali, ma e' utile nei report."
 
 #. module: account
+<<<<<<< TREE
 #: view:account.unreconcile:0
 #: view:account.unreconcile.reconcile:0
 msgid "Unreconcile Transactions"
 msgstr ""
+=======
+#: view:account.unreconcile:0
+#: view:account.unreconcile.reconcile:0
+msgid "Unreconcile Transactions"
+msgstr "Annulla riconciliazione transazioni"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: field:wizard.multi.charts.accounts,only_one_chart_template:0
@@ -3588,9 +3679,15 @@
 msgstr "Quantità di cifre da usare per il codice di conto"
 
 #. module: account
+<<<<<<< TREE
 #: field:res.partner,property_supplier_payment_term:0
 msgid "Supplier Payment Term"
 msgstr ""
+=======
+#: field:res.partner,property_supplier_payment_term:0
+msgid "Supplier Payment Term"
+msgstr "Termini di pagamento fornitore"
+>>>>>>> MERGE-SOURCE
 
 #. module: account
 #: view:account.fiscalyear:0
@@ -3663,11 +3760,19 @@
 msgstr "File elettronico"
 
 #. module: account
+<<<<<<< TREE
 #: field:account.move.line,reconcile:0
 msgid "Reconcile Ref"
 msgstr ""
 
 #. module: account
+=======
+#: field:account.move.line,reconcile:0
+msgid "Reconcile Ref"
+msgstr "Rif riconciliazione"
+
+#. module: account
+>>>>>>> MERGE-SOURCE
 #: field:account.config.settings,has_chart_of_accounts:0
 msgid "Company has a chart of accounts"
 msgstr "L'azienda ha un piano dei conti"
@@ -4748,13 +4853,25 @@
 msgstr "Bilancio analitico"