[FIX] *: remove conflict markers from ta.po files

4 files changed, 0 insertions, 440 deletions

diff --git a/addons/account_anglo_saxon/i18n/ta.po b/addons/account_anglo_saxon/i18n/ta.po
index 3342e8b5cea..2787d1ab2cf 100644
--- a/addons/account_anglo_saxon/i18n/ta.po
+++ b/addons/account_anglo_saxon/i18n/ta.po
@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-# Tamil translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Tamil <ta@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-15 06:49+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-=======
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_anglo_saxon
@@ -37,7 +17,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
->>>>>>> 8.0
 
 #. module: account_anglo_saxon
 #: help:account.invoice.line,move_id:0
@@ -49,11 +28,7 @@ msgstr ""
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice
 msgid "Invoice"
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "விலைப்பட்டியல்"
->>>>>>> 8.0
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_account_invoice_line
@@ -74,11 +49,7 @@ msgstr ""
 #: field:product.category,property_account_creditor_price_difference_categ:0
 #: field:product.template,property_account_creditor_price_difference:0
 msgid "Price Difference Account"
-<<<<<<< HEAD
-msgstr "விலை வேறுபாட்டு கணக்கு"
-=======
 msgstr ""
->>>>>>> 8.0
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_category
@@ -88,11 +59,7 @@ msgstr ""
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_product_template
 msgid "Product Template"
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "தயாரிப்பு டெம்ப்ளேட்"
->>>>>>> 8.0
 
 #. module: account_anglo_saxon
 #: model:ir.model,name:account_anglo_saxon.model_purchase_order
@@ -100,14 +67,11 @@ msgid "Purchase Order"
 msgstr ""
 
 #. module: account_anglo_saxon
-<<<<<<< HEAD
-=======
 #: model:ir.model,name:account_anglo_saxon.model_stock_move
 msgid "Stock Move"
 msgstr ""
 
 #. module: account_anglo_saxon
->>>>>>> 8.0
 #: help:product.category,property_account_creditor_price_difference_categ:0
 #: help:product.template,property_account_creditor_price_difference:0
 msgid ""
diff --git a/addons/account_cancel/i18n/ta.po b/addons/account_cancel/i18n/ta.po
index 8e6eb0f69e1..81032e530fa 100644
--- a/addons/account_cancel/i18n/ta.po
+++ b/addons/account_cancel/i18n/ta.po
@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-# Tamil translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:08+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Tamil <ta@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-15 06:50+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-=======
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * account_cancel
@@ -46,24 +26,17 @@ msgstr ""
 #: model:ir.model,name:account_cancel.model_account_bank_statement_line
 msgid "Bank Statement Line"
 msgstr ""
->>>>>>> 8.0
 
 #. module: account_cancel
 #: view:account.bank.statement:account_cancel.bank_statement_cancel_form_inherit
 msgid "Cancel"
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "ரத்து"
->>>>>>> 8.0
 
 #. module: account_cancel
 #: view:account.invoice:account_cancel.invoice_form_cancel_inherit
 #: view:account.invoice:account_cancel.invoice_supplier_cancel_form_inherit
 msgid "Cancel Invoice"
 msgstr ""
-<<<<<<< HEAD
-=======
 
 #. module: account_cancel
 #: code:addons/account_cancel/models/account_bank_statement.py:22
@@ -75,4 +48,3 @@ msgstr ""
 #: view:account.bank.statement:account_cancel.bank_statement_draft_form_inherit
 msgid "Reset to New"
 msgstr ""
->>>>>>> 8.0
diff --git a/addons/edi/i18n/ta.po b/addons/edi/i18n/ta.po
index d8e6d0ae381..e1fe48f0076 100644
--- a/addons/edi/i18n/ta.po
+++ b/addons/edi/i18n/ta.po
@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-# Tamil translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2014-08-14 13:09+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Tamil <ta@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-15 07:06+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-=======
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * edi
@@ -36,7 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
->>>>>>> 8.0
 
 #. module: edi
 #: code:addons/edi/models/edi.py:46
@@ -52,11 +31,7 @@ msgstr "நிறுவனங்கள்"
 #. module: edi
 #: model:ir.model,name:edi.model_res_currency
 msgid "Currency"
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "நாணயம்"
->>>>>>> 8.0
 
 #. module: edi
 #. openerp-web
@@ -73,11 +48,7 @@ msgstr ""
 #. module: edi
 #: field:edi.edi,id:0
 msgid "ID"
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "ID"
->>>>>>> 8.0
 
 #. module: edi
 #: code:addons/edi/models/edi.py:129
@@ -88,11 +59,7 @@ msgstr ""
 #. module: edi
 #: model:ir.model,name:edi.model_res_partner
 msgid "Partner"
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "கூட்டாளி"
->>>>>>> 8.0
 
 #. module: edi
 #. openerp-web
diff --git a/addons/l10n_in_hr_payroll/i18n/ta.po b/addons/l10n_in_hr_payroll/i18n/ta.po
index d47d3936374..74f39e6e49c 100644
--- a/addons/l10n_in_hr_payroll/i18n/ta.po
+++ b/addons/l10n_in_hr_payroll/i18n/ta.po
@@ -1,23 +1,3 @@
-<<<<<<< HEAD
-# Tamil translation for openobject-addons
-# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-11-24 02:53+0000\n"
-"PO-Revision-Date: 2014-08-14 16:10+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Tamil <ta@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2014-08-15 07:22+0000\n"
-"X-Generator: Launchpad (build 17156)\n"
-=======
 # Translation of OpenERP Server.
 # This file contains the translation of the following modules:
 # * l10n_in_hr_payroll
@@ -36,7 +16,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Language: ta\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
->>>>>>> 8.0
 
 #. module: l10n_in_hr_payroll
 #: report:salary.detail.byyear:0
@@ -74,13 +53,7 @@ msgid "Payslips which are paid"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-#: view:payslip.report:0
-=======
 #: view:hr.payroll.advice:0 view:payment.advice.report:0 view:payslip.report:0
->>>>>>> 8.0
 msgid "Group By..."
 msgstr ""
 
@@ -127,23 +100,6 @@ msgid "Payslips"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: selection:payment.advice.report,month:0
-#: selection:payslip.report,month:0
-msgid "March"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,company_id:0
-#: field:hr.payroll.advice.line,company_id:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,company_id:0
-#: view:payslip.report:0
-#: field:payslip.report,company_id:0
-msgid "Company"
-msgstr ""
-=======
 #: selection:payment.advice.report,month:0 selection:payslip.report,month:0
 msgid "March"
 msgstr "மார்ச்"
@@ -155,7 +111,6 @@ msgstr "மார்ச்"
 #: field:payslip.report,company_id:0
 msgid "Company"
 msgstr "நிறுவனம்"
->>>>>>> 8.0
 
 #. module: l10n_in_hr_payroll
 #: report:payroll.advice:0
@@ -208,15 +163,8 @@ msgid "Pay Slip"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:payment.advice.report:0
-#: field:payment.advice.report,day:0
-#: view:payslip.report:0
-#: field:payslip.report,day:0
-=======
 #: view:payment.advice.report:0 field:payment.advice.report,day:0
 #: view:payslip.report:0 field:payslip.report,day:0
->>>>>>> 8.0
 msgid "Day"
 msgstr ""
 
@@ -246,12 +194,7 @@ msgid "Other Information"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: selection:hr.payroll.advice,state:0
-#: selection:payment.advice.report,state:0
-=======
 #: selection:hr.payroll.advice,state:0 selection:payment.advice.report,state:0
->>>>>>> 8.0
 msgid "Cancelled"
 msgstr ""
 
@@ -271,12 +214,7 @@ msgid "Details by Salary Rule Category:"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: field:hr.payroll.advice,number:0
-#: report:paylip.details.in:0
-=======
 #: field:hr.payroll.advice,number:0 report:paylip.details.in:0
->>>>>>> 8.0
 msgid "Reference"
 msgstr ""
 
@@ -291,12 +229,7 @@ msgid "Identification No"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:payslip.report:0
-#: field:payslip.report,struct_id:0
-=======
 #: view:payslip.report:0 field:payslip.report,struct_id:0
->>>>>>> 8.0
 msgid "Structure"
 msgstr ""
 
@@ -306,43 +239,23 @@ msgid "form period"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: selection:hr.payroll.advice,state:0
-#: selection:payment.advice.report,state:0
-=======
 #: selection:hr.payroll.advice,state:0 selection:payment.advice.report,state:0
->>>>>>> 8.0
 msgid "Confirmed"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: report:salary.detail.byyear:0
-#: report:salary.employee.bymonth:0
-=======
 #: report:salary.detail.byyear:0 report:salary.employee.bymonth:0
->>>>>>> 8.0
 msgid "From"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: field:hr.payroll.advice.line,bysal:0
-#: field:payment.advice.report,bysal:0
-=======
 #: field:hr.payroll.advice.line,bysal:0 field:payment.advice.report,bysal:0
->>>>>>> 8.0
 #: report:payroll.advice:0
 msgid "By Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:hr.payroll.advice:0
-#: view:payment.advice.report:0
-=======
 #: view:hr.payroll.advice:0 view:payment.advice.report:0
->>>>>>> 8.0
 msgid "Confirm"
 msgstr ""
 
@@ -398,11 +311,7 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0
 msgid "Email"
-<<<<<<< HEAD
-msgstr ""
-=======
 msgstr "மின்னஞ்சல்"
->>>>>>> 8.0
 
 #. module: l10n_in_hr_payroll
 #: help:hr.payslip.run,available_advice:0
@@ -426,12 +335,7 @@ msgid "Made Payment Order ? "
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-=======
 #: view:hr.salary.employee.month:0 view:yearly.salary.detail:0
->>>>>>> 8.0
 msgid "Print"
 msgstr ""
 
@@ -451,12 +355,7 @@ msgid "Payslip Batches"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: field:hr.payroll.advice.line,debit_credit:0
-#: report:payroll.advice:0
-=======
 #: field:hr.payroll.advice.line,debit_credit:0 report:payroll.advice:0
->>>>>>> 8.0
 msgid "C/D"
 msgstr ""
 
@@ -476,16 +375,9 @@ msgid "Employee Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: selection:payment.advice.report,month:0
-#: selection:payslip.report,month:0
-msgid "July"
-msgstr ""
-=======
 #: selection:payment.advice.report,month:0 selection:payslip.report,month:0
 msgid "July"
 msgstr "ஜூலை"
->>>>>>> 8.0
 
 #. module: l10n_in_hr_payroll
 #: view:res.company:0
@@ -523,12 +415,7 @@ msgid "IFSC"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: report:paylip.details.in:0
-#: field:payslip.report,date_to:0
-=======
 #: report:paylip.details.in:0 field:payslip.report,date_to:0
->>>>>>> 8.0
 msgid "Date To"
 msgstr ""
 
@@ -553,16 +440,9 @@ msgid "Dearness Allowance"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: selection:payment.advice.report,month:0
-#: selection:payslip.report,month:0
-msgid "August"
-msgstr ""
-=======
 #: selection:payment.advice.report,month:0 selection:payslip.report,month:0
 msgid "August"
 msgstr "ஆகஸ்ட்"
->>>>>>> 8.0
 
 #. module: l10n_in_hr_payroll
 #: view:hr.contract:0
@@ -580,16 +460,9 @@ msgid "Payment Advices which are in confirm state"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: selection:payment.advice.report,month:0
-#: selection:payslip.report,month:0
-msgid "December"
-msgstr ""
-=======
 #: selection:payment.advice.report,month:0 selection:payslip.report,month:0
 msgid "December"
 msgstr "டிசம்பர்"
->>>>>>> 8.0
 
 #. module: l10n_in_hr_payroll
 #: view:hr.payroll.advice:0
@@ -597,19 +470,10 @@ msgid "Confirm Sheet"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:payment.advice.report:0
-#: field:payment.advice.report,month:0
-#: view:payslip.report:0
-#: field:payslip.report,month:0
-msgid "Month"
-msgstr ""
-=======
 #: view:payment.advice.report:0 field:payment.advice.report,month:0
 #: view:payslip.report:0 field:payslip.report,month:0
 msgid "Month"
 msgstr "மாதம்"
->>>>>>> 8.0
 
 #. module: l10n_in_hr_payroll
 #: report:salary.detail.byyear:0
@@ -617,12 +481,7 @@ msgid "Employee Code"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-=======
 #: view:hr.salary.employee.month:0 view:yearly.salary.detail:0
->>>>>>> 8.0
 msgid "or"
 msgstr ""
 
@@ -632,12 +491,7 @@ msgid "Hr Salary Employee By Month Report"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: field:hr.salary.employee.month,category_id:0
-#: view:payslip.report:0
-=======
 #: field:hr.salary.employee.month,category_id:0 view:payslip.report:0
->>>>>>> 8.0
 #: field:payslip.report,category_id:0
 msgid "Category"
 msgstr ""
@@ -665,28 +519,14 @@ msgid "Salary Rule Category"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:hr.payroll.advice:0
-#: selection:hr.payroll.advice,state:0
-#: view:payment.advice.report:0
-#: selection:payment.advice.report,state:0
-#: view:payslip.report:0
-#: selection:payslip.report,state:0
-=======
 #: view:hr.payroll.advice:0 selection:hr.payroll.advice,state:0
 #: view:payment.advice.report:0 selection:payment.advice.report,state:0
 #: view:payslip.report:0 selection:payslip.report,state:0
->>>>>>> 8.0
 msgid "Draft"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: report:paylip.details.in:0
-#: field:payslip.report,date_from:0
-=======
 #: report:paylip.details.in:0 field:payslip.report,date_from:0
->>>>>>> 8.0
 msgid "Date From"
 msgstr ""
 
@@ -701,18 +541,9 @@ msgid "Payment Advice Analysis"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,state:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,state:0
-#: view:payslip.report:0
-#: field:payslip.report,state:0
-=======
 #: view:hr.payroll.advice:0 field:hr.payroll.advice,state:0
 #: view:payment.advice.report:0 field:payment.advice.report,state:0
 #: view:payslip.report:0 field:payslip.report,state:0
->>>>>>> 8.0
 msgid "Status"
 msgstr ""
 
@@ -723,26 +554,14 @@ msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice.line,ifsc_code:0
-<<<<<<< HEAD
-#: field:payment.advice.report,ifsc_code:0
-#: report:payroll.advice:0
-=======
 #: field:payment.advice.report,ifsc_code:0 report:payroll.advice:0
->>>>>>> 8.0
 msgid "IFSC Code"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: selection:payment.advice.report,month:0
-#: selection:payslip.report,month:0
-msgid "June"
-msgstr ""
-=======
 #: selection:payment.advice.report,month:0 selection:payslip.report,month:0
 msgid "June"
 msgstr "ஜூன்"
->>>>>>> 8.0
 
 #. module: l10n_in_hr_payroll
 #: view:payslip.report:0
@@ -758,12 +577,7 @@ msgid ""
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:payment.advice.report:0
-#: field:payment.advice.report,nbr:0
-=======
 #: view:payment.advice.report:0 field:payment.advice.report,nbr:0
->>>>>>> 8.0
 msgid "# Payment Lines"
 msgstr ""
 
@@ -778,33 +592,17 @@ msgid "Payment Lines"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: field:hr.payroll.advice,date:0
-#: field:payment.advice.report,date:0
-=======
 #: field:hr.payroll.advice,date:0 field:payment.advice.report,date:0
->>>>>>> 8.0
 msgid "Date"
 msgstr "தேதி"
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: selection:payment.advice.report,month:0
-#: selection:payslip.report,month:0
-msgid "November"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payment.advice.report:0
-#: view:payslip.report:0
-=======
 #: selection:payment.advice.report,month:0 selection:payslip.report,month:0
 msgid "November"
 msgstr "நவம்பர்"
 
 #. module: l10n_in_hr_payroll
 #: view:payment.advice.report:0 view:payslip.report:0
->>>>>>> 8.0
 msgid "Extended Filters..."
 msgstr ""
 
@@ -814,23 +612,12 @@ msgid "This report performs analysis on Payment Advices"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: selection:payment.advice.report,month:0
-#: selection:payslip.report,month:0
-msgid "October"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-=======
 #: selection:payment.advice.report,month:0 selection:payslip.report,month:0
 msgid "October"
 msgstr "அக்டோபர்"
 
 #. module: l10n_in_hr_payroll
 #: report:paylip.details.in:0 report:salary.detail.byyear:0
->>>>>>> 8.0
 msgid "Designation"
 msgstr ""
 
@@ -840,16 +627,9 @@ msgid "Month of Payslip"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: selection:payment.advice.report,month:0
-#: selection:payslip.report,month:0
-msgid "January"
-msgstr ""
-=======
 #: selection:payment.advice.report,month:0 selection:payslip.report,month:0
 msgid "January"
 msgstr "ஜனவரி"
->>>>>>> 8.0
 
 #. module: l10n_in_hr_payroll
 #: view:yearly.salary.detail:0
@@ -862,12 +642,7 @@ msgid "Companies"
 msgstr "நிறுவனங்கள்"
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: report:paylip.details.in:0
-#: report:payroll.advice:0
-=======
 #: report:paylip.details.in:0 report:payroll.advice:0
->>>>>>> 8.0
 msgid "Authorized Signature"
 msgstr ""
 
@@ -902,12 +677,7 @@ msgid "Payslips which are in draft state"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice.line,advice_id:0
-=======
 #: view:hr.payroll.advice:0 field:hr.payroll.advice.line,advice_id:0
->>>>>>> 8.0
 #: field:hr.payslip,advice_id:0
 #: model:ir.model,name:l10n_in_hr_payroll.model_hr_payroll_advice
 msgid "Bank Advice"
@@ -929,49 +699,25 @@ msgid "Check this box if your company use online transfer for salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: field:payment.advice.report,number:0
-#: field:payslip.report,number:0
-=======
 #: field:payment.advice.report,number:0 field:payslip.report,number:0
->>>>>>> 8.0
 msgid "Number"
 msgstr "எண்"
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: selection:payment.advice.report,month:0
-#: selection:payslip.report,month:0
-msgid "September"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: view:payslip.report:0
-#: selection:payslip.report,state:0
-=======
 #: selection:payment.advice.report,month:0 selection:payslip.report,month:0
 msgid "September"
 msgstr "செப்டம்பர்"
 
 #. module: l10n_in_hr_payroll
 #: view:payslip.report:0 selection:payslip.report,state:0
->>>>>>> 8.0
 msgid "Done"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:hr.payroll.advice:0
-#: view:hr.salary.employee.month:0
-#: view:yearly.salary.detail:0
-msgid "Cancel"
-msgstr ""
-=======
 #: view:hr.payroll.advice:0 view:hr.salary.employee.month:0
 #: view:yearly.salary.detail:0
 msgid "Cancel"
 msgstr "ரத்து"
->>>>>>> 8.0
 
 #. module: l10n_in_hr_payroll
 #: view:payment.advice.report:0
@@ -1001,15 +747,8 @@ msgid "Total Salary"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: field:hr.payroll.advice.line,employee_id:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,employee_id:0
-#: view:payslip.report:0
-=======
 #: field:hr.payroll.advice.line,employee_id:0 view:payment.advice.report:0
 #: field:payment.advice.report,employee_id:0 view:payslip.report:0
->>>>>>> 8.0
 #: field:payslip.report,employee_id:0
 msgid "Employee"
 msgstr ""
@@ -1027,22 +766,12 @@ msgstr ""
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,note:0
 msgid "Description"
-<<<<<<< HEAD
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: selection:payment.advice.report,month:0
-#: selection:payslip.report,month:0
-msgid "May"
-msgstr ""
-=======
 msgstr "விளக்கம்"
 
 #. module: l10n_in_hr_payroll
 #: selection:payment.advice.report,month:0 selection:payslip.report,month:0
 msgid "May"
 msgstr "மே"
->>>>>>> 8.0
 
 #. module: l10n_in_hr_payroll
 #: view:res.company:0
@@ -1055,28 +784,14 @@ msgid "NEFT"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: report:paylip.details.in:0
-#: report:salary.detail.byyear:0
-=======
 #: report:paylip.details.in:0 report:salary.detail.byyear:0
->>>>>>> 8.0
 msgid "Address"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,bank_id:0
-#: view:payment.advice.report:0
-#: field:payment.advice.report,bank_id:0
-#: report:payroll.advice:0
-#: report:salary.detail.byyear:0
-=======
 #: view:hr.payroll.advice:0 field:hr.payroll.advice,bank_id:0
 #: view:payment.advice.report:0 field:payment.advice.report,bank_id:0
 #: report:payroll.advice:0 report:salary.detail.byyear:0
->>>>>>> 8.0
 msgid "Bank"
 msgstr ""
 
@@ -1087,16 +802,9 @@ msgid "End Date"
 msgstr "கடைசி தேதி"
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: selection:payment.advice.report,month:0
-#: selection:payslip.report,month:0
-msgid "February"
-msgstr ""
-=======
 #: selection:payment.advice.report,month:0 selection:payslip.report,month:0
 msgid "February"
 msgstr "பிப்ரவரி"
->>>>>>> 8.0
 
 #. module: l10n_in_hr_payroll
 #: sql_constraint:res.company:0
@@ -1104,29 +812,15 @@ msgid "The company name must be unique !"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:hr.payroll.advice:0
-#: field:hr.payroll.advice,name:0
-#: report:paylip.details.in:0
-#: field:payment.advice.report,name:0
-#: field:payslip.report,name:0
-#: report:salary.employee.bymonth:0
-=======
 #: view:hr.payroll.advice:0 field:hr.payroll.advice,name:0
 #: report:paylip.details.in:0 field:payment.advice.report,name:0
 #: field:payslip.report,name:0 report:salary.employee.bymonth:0
->>>>>>> 8.0
 msgid "Name"
 msgstr "பெயர்"
 
 #. module: l10n_in_hr_payroll
 #: view:hr.salary.employee.month:0
-<<<<<<< HEAD
-#: field:hr.salary.employee.month,employee_ids:0
-#: view:yearly.salary.detail:0
-=======
 #: field:hr.salary.employee.month,employee_ids:0 view:yearly.salary.detail:0
->>>>>>> 8.0
 #: field:yearly.salary.detail,employee_ids:0
 msgid "Employees"
 msgstr ""
@@ -1145,16 +839,9 @@ msgid "Payslip Analysis"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: selection:payment.advice.report,month:0
-#: selection:payslip.report,month:0
-msgid "April"
-msgstr ""
-=======
 #: selection:payment.advice.report,month:0 selection:payslip.report,month:0
 msgid "April"
 msgstr "ஏப்ரல்"
->>>>>>> 8.0
 
 #. module: l10n_in_hr_payroll
 #: report:payroll.advice:0
@@ -1210,12 +897,7 @@ msgid "Credit"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: field:hr.payroll.advice.line,name:0
-#: report:payroll.advice:0
-=======
 #: field:hr.payroll.advice.line,name:0 report:payroll.advice:0
->>>>>>> 8.0
 msgid "Bank Account No."
 msgstr ""
 
@@ -1235,18 +917,6 @@ msgid "Create Advice"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: view:payment.advice.report:0
-#: field:payment.advice.report,year:0
-#: view:payslip.report:0
-#: field:payslip.report,year:0
-msgid "Year"
-msgstr ""
-
-#. module: l10n_in_hr_payroll
-#: field:hr.payroll.advice,neft:0
-#: field:payment.advice.report,neft:0
-=======
 #: view:payment.advice.report:0 field:payment.advice.report,year:0
 #: view:payslip.report:0 field:payslip.report,year:0
 msgid "Year"
@@ -1254,33 +924,20 @@ msgstr "ஆண்டு"
 
 #. module: l10n_in_hr_payroll
 #: field:hr.payroll.advice,neft:0 field:payment.advice.report,neft:0
->>>>>>> 8.0
 msgid "NEFT Transaction"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
-<<<<<<< HEAD
-#: report:paylip.details.in:0
-#: field:payslip.report,total:0
-#: report:salary.detail.byyear:0
-#: report:salary.employee.bymonth:0
-=======
 #: report:paylip.details.in:0 field:payslip.report,total:0
 #: report:salary.detail.byyear:0 report:salary.employee.bymonth:0
->>>>>>> 8.0
 msgid "Total"
 msgstr ""
 
 #. module: l10n_in_hr_payroll
 #: help:hr.contract,house_rent_allowance_metro_nonmetro:0
 msgid ""
-<<<<<<< HEAD
-"HRA is an allowance given by the employer to the employee for taking care of "
-"his rental or accommodation expenses for metro city it is 50 % and for non "
-=======
 "HRA is an allowance given by the employer to the employee for taking care of"
 " his rental or accommodation expenses for metro city it is 50 % and for non "
->>>>>>> 8.0
 "metro 40%.HRA computed as percentage(%)"
 msgstr ""