[MERGE]Merge with openobject-addons

[odoo/odoo.git] / addons / hr_payroll_account / i18n / hr_payroll_account.pot

diff --git a/addons/hr_payroll_account/i18n/hr_payroll_account.pot b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
index 6953f24..cd2b961 100644 (file)
--- a/addons/hr_payroll_account/i18n/hr_payroll_account.pot
+++ b/addons/hr_payroll_account/i18n/hr_payroll_account.pot
@@ -4,10 +4,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0.0-rc1\n"
+"Project-Id-Version: OpenERP Server 6.0.0-rc2\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
-"POT-Creation-Date: 2010-12-21 19:44:14+0000\n"
-"PO-Revision-Date: 2010-12-21 19:44:14+0000\n"
+"POT-Creation-Date: 2011-01-11 11:15:18+0000\n"
+"PO-Revision-Date: 2011-01-11 11:15:18+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -42,6 +42,12 @@ msgid "Analytic Account for Salary Analysis"
 msgstr ""
 
 #. module: hr_payroll_account
+#: field:hr.payroll.register,journal_id:0
+#: field:hr.payslip,journal_id:0
+msgid "Expense Journal"
+msgstr ""
+
+#. module: hr_payroll_account
 #: field:hr.contibution.register.line,period_id:0
 msgid "Period"
 msgstr ""
@@ -57,14 +63,13 @@ msgid "Other Informations"
 msgstr ""
 
 #. module: hr_payroll_account
-#: field:hr.payroll.register,journal_id:0
-#: field:hr.payslip,journal_id:0
-msgid "Expanse Journal"
+#: field:hr.employee,salary_account:0
+msgid "Salary Account"
 msgstr ""
 
 #. module: hr_payroll_account
-#: field:hr.employee,salary_account:0
-msgid "Salary Account"
+#: help:hr.employee,property_bank_account:0
+msgid "Select Bank Account from where Salary Expense will be Paid"
 msgstr ""
 
 #. module: hr_payroll_account
@@ -83,13 +88,13 @@ msgid "Description"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:330
 #, python-format
 msgid "Please Confirm all Expense Invoice appear for Reimbursement"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
 #, python-format
 msgid "Please defined partner in bank account for %s !"
 msgstr ""
@@ -100,7 +105,12 @@ msgid "Accounting Informations"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: help:hr.employee,salary_account:0
+msgid "Expense account when Salary Expense will be recorded"
+msgstr ""
+
+#. module: hr_payroll_account
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
 #, python-format
 msgid "Please defined bank account for %s !"
 msgstr ""
@@ -126,19 +136,16 @@ msgid "Payment Lines"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:444
 #, python-format
 msgid "Please define fiscal year for perticular contract"
 msgstr ""
 
 #. module: hr_payroll_account
-#: help:hr.employee,property_bank_account:0
-msgid "Select Bank Account from where Salary Expanse will be Paid"
-msgstr ""
-
-#. module: hr_payroll_account
-#: help:hr.employee,salary_account:0
-msgid "Expanse account when Salary Expanse will be recorded"
+#: field:hr.payslip.account.move,slip_id:0
+#: model:ir.model,name:hr_payroll_account.model_hr_payslip
+msgid "Pay Slip"
 msgstr ""
 
 #. module: hr_payroll_account
@@ -205,7 +212,13 @@ msgid "Accounting vouchers"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:273
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:283
+#: code:addons/hr_payroll_account/hr_payroll_account.py:330
+#: code:addons/hr_payroll_account/hr_payroll_account.py:444
+#: code:addons/hr_payroll_account/hr_payroll_account.py:451
+#: code:addons/hr_payroll_account/hr_payroll_account.py:454
 #, python-format
 msgid "Warning !"
 msgstr ""
@@ -231,12 +244,6 @@ msgid "Sequence"
 msgstr ""
 
 #. module: hr_payroll_account
-#: field:hr.payslip.account.move,slip_id:0
-#: model:ir.model,name:hr_payroll_account.model_hr_payslip
-msgid "Pay Slip"
-msgstr ""
-
-#. module: hr_payroll_account
 #: field:hr.payroll.register,period_id:0
 #: field:hr.payslip,period_id:0
 msgid "Force Period"
@@ -248,7 +255,8 @@ msgid "Leave Type"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:280
+#: code:addons/hr_payroll_account/hr_payroll_account.py:451
 #, python-format
 msgid "Fiscal Year is not defined for slip date %s"
 msgstr ""
@@ -278,7 +286,7 @@ msgid "Salary Structure"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
 #, python-format
 msgid "Please Configure Partners Receivable Account!!"
 msgstr ""
@@ -289,29 +297,28 @@ msgid "Year"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:283
+#: code:addons/hr_payroll_account/hr_payroll_account.py:454
 #, python-format
 msgid "Period is not defined for slip date %s"
 msgstr ""
 
 #. module: hr_payroll_account
-#: view:hr.employee:0
-msgid "Accounting"
-msgstr ""
-
-#. module: hr_payroll_account
 #: view:hr.payslip:0
 msgid "Accounting Details"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
 #, python-format
 msgid "Please Configure Partners Payable Account!!"
 msgstr ""
 
 #. module: hr_payroll_account
-#: code:addons/hr_payroll_account/hr_payroll_account.py:0
+#: code:addons/hr_payroll_account/hr_payroll_account.py:429
+#: code:addons/hr_payroll_account/hr_payroll_account.py:432
+#: code:addons/hr_payroll_account/hr_payroll_account.py:533
+#: code:addons/hr_payroll_account/hr_payroll_account.py:550
 #, python-format
 msgid "Integrity Error !"
 msgstr ""