From d55f64360a1679b9fb6427ca367c4acbf311b46e Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 11:48:54 +0530
Subject: [PATCH 01/32] [FIX]mail:menu string changed

bzr revid: kbh@tinyerp.com-20121219061854-cb7ar3aa7aytr6at
---
 addons/mail/mail_thread_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/mail/mail_thread_view.xml b/addons/mail/mail_thread_view.xml
index d5c111573ea..6769fb0d063 100644
--- a/addons/mail/mail_thread_view.xml
+++ b/addons/mail/mail_thread_view.xml
@@ -55,7 +55,7 @@
         </record>
 
         <record id="action_mail_star_feeds" model="ir.actions.client">
-            <field name="name">Todo</field>
+            <field name="name">To-do</field>
             <field name="tag">mail.wall</field>
             <field name="res_model">mail.message</field>
             <field name="context">{
@@ -130,7 +130,7 @@
           <field name="parent_id" ref="mail.mail_feeds"/>
         </record>
         <record id="mail_starfeeds" model="ir.ui.menu">
-          <field name="name">Todo</field>
+          <field name="name">To-do</field>
           <field name="sequence" eval="14"/>
           <field name="action" ref="action_mail_star_feeds"/>
           <field name="parent_id" ref="mail.mail_feeds"/>

From 0843f19d0b362cfe3f3b17c28dab9c652b700213 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 11:58:13 +0530
Subject: [PATCH 02/32] [FIX]portal:menu string changed

bzr revid: kbh@tinyerp.com-20121219062813-mlijrqastnv1x63n
---
 addons/portal/portal_data.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/portal/portal_data.xml b/addons/portal/portal_data.xml
index 5fc1e07982c..8285b39521b 100644
--- a/addons/portal/portal_data.xml
+++ b/addons/portal/portal_data.xml
@@ -14,7 +14,7 @@
 
         <!-- Mail group for the company's news -->
         <record id="company_news_feed" model="mail.group">
-            <field name="name">Company's news</field>
+            <field name="name">Company News</field>
             <field name="public">public</field>
         </record>
 
@@ -46,7 +46,7 @@
 
         <!-- Mail group for the company's jobs -->
         <record id="company_jobs" model="mail.group">
-            <field name="name">Company's jobs</field>
+            <field name="name">Company Jobs</field>
             <field name="public">public</field>
         </record>
 

From f2333746574a6a999362f563f30582a67bbd34d9 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 12:00:50 +0530
Subject: [PATCH 03/32] [FIX]account_analytic_analysis:menu string changed

bzr revid: kbh@tinyerp.com-20121219063050-6418jrzcmh8vqe5x
---
 .../account_analytic_analysis_view.xml                          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_analytic_analysis/account_analytic_analysis_view.xml b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
index 1f1117aec1b..f4d0daf6297 100644
--- a/addons/account_analytic_analysis/account_analytic_analysis_view.xml
+++ b/addons/account_analytic_analysis/account_analytic_analysis_view.xml
@@ -167,7 +167,7 @@
         </record>
 
         <record id="template_of_contract_action" model="ir.actions.act_window">
-            <field name="name">Template of Contract</field>
+            <field name="name">Contract Template</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">account.analytic.account</field>
             <field name="view_type">form</field>

From 940f0d2e07f8056b0d183ec5bc112cdad1c30e17 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 19 Dec 2012 12:15:50 +0530
Subject: [PATCH 04/32] [IMP] improve the string leave type in hr_holiday
 module

bzr revid: rma@tinyerp.com-20121219064550-l23b320dnokzkc02
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index f8b4ad07b77..6e1eb3b1d88 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -443,7 +443,7 @@
         </record>
 
         <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
-        <menuitem name="Leaves Types" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10"/>
+        <menuitem name="Time Off Categories" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10"/>
 
         <!-- Holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">

From d4de93e3717d5c87ebc799cdfc9f4fe6accda6e5 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 12:18:44 +0530
Subject: [PATCH 05/32] [FIX]project_long_term:menu and page string changed

bzr revid: kbh@tinyerp.com-20121219064844-r6iu4pr6wu4ksvr9
---
 addons/project_long_term/project_long_term_view.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 18e471ddd40..e8e21caab0a 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -60,7 +60,7 @@
             <field name="name">project.user.allocation.search</field>
             <field name="model">project.user.allocation</field>
             <field name="arch" type="xml">
-                <search string="Planning of Users">
+                <search string="Team Planning">
                     <field name="user_id"/>
                     <field name="phase_id"/>
                     <field name="project_id"/>
@@ -73,7 +73,7 @@
             </field>
         </record>
         <record id="act_resouce_allocation" model="ir.actions.act_window">
-            <field name="name">Planning of Users</field>
+            <field name="name">Team Planning</field>
             <field name="res_model">project.user.allocation</field>
             <field name="view_type">form</field>
             <field name="view_mode">gantt,tree,form,calendar</field>
@@ -171,7 +171,7 @@
                         </group>
                     </group>
                     <notebook>
-                        <page string="Planning of Users">
+                        <page string="Team Planning">
                             <field name="user_ids">
                                  <tree editable="bottom" string="Project Users">
                                       <field name="user_id"/>

From e60b495ebd31324e806a89509c5620307b0c3da6 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 19 Dec 2012 12:20:41 +0530
Subject: [PATCH 06/32] [IMP] improve the string of expense type

bzr revid: rma@tinyerp.com-20121219065041-zwm9w62474x4jstl
---
 addons/hr_expense/hr_expense_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_expense/hr_expense_view.xml b/addons/hr_expense/hr_expense_view.xml
index 2c206589ac2..0324388786f 100644
--- a/addons/hr_expense/hr_expense_view.xml
+++ b/addons/hr_expense/hr_expense_view.xml
@@ -212,7 +212,7 @@
             <field name="search_view_id" ref="product.product_search_form_view"/>
         </record>
 
-        <menuitem id="menu_hr_product" name="Types of Expenses" parent="hr.menu_hr_configuration" action="hr_expense_product"/>
+        <menuitem id="menu_hr_product" name="Expense Categories" parent="hr.menu_hr_configuration" action="hr_expense_product"/>
         <menuitem id="next_id_49" name="Expenses" sequence="15" parent="hr.menu_hr_root"/>
         <menuitem action="expense_all" id="menu_expense_all" name="Expenses" parent="next_id_49"/>
 

From 11945fe97686c80b3ded0185d1f5d52653177e17 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 12:21:00 +0530
Subject: [PATCH 07/32] [FIX]project_timesheet:menu string changed

bzr revid: kbh@tinyerp.com-20121219065100-vh86z1wshrrw8mfm
---
 addons/project_timesheet/project_timesheet_view.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/project_timesheet/project_timesheet_view.xml b/addons/project_timesheet/project_timesheet_view.xml
index 0f6c8f3340b..548264eb07b 100644
--- a/addons/project_timesheet/project_timesheet_view.xml
+++ b/addons/project_timesheet/project_timesheet_view.xml
@@ -78,7 +78,7 @@
 
         <!-- Menus -->
         <record id="action_project_timesheet_bill_task" model="ir.actions.act_window">
-            <field name="name">Invoice Tasks Work</field>
+            <field name="name">Invoice Tasks</field>
             <field name="res_model">account.analytic.line</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -100,7 +100,7 @@
         <menuitem id="menu_project_billing" name="Invoicing"
                   parent="base.menu_main_pm" sequence="5"
                   groups="project.group_project_manager"/>
-        <menuitem id="menu_project_billing_line" name="Invoice Tasks Work"
+        <menuitem id="menu_project_billing_line" name="Invoice Tasks"
             parent="menu_project_billing" action="action_project_timesheet_bill_task"/>
 
         <!--

From ad8d6a09670a42999e956ab41fef5dbb084ae0e9 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 19 Dec 2012 12:25:50 +0530
Subject: [PATCH 08/32] [IMP] improve the of hr_evaluation

bzr revid: rma@tinyerp.com-20121219065550-nc3p2u34pw8nskjr
---
 addons/hr_evaluation/hr_evaluation_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 82ef2aa83f4..54baee5f538 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -379,7 +379,7 @@
             <field name="search_view_id" ref="view_hr_evaluation_interview_search"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to create a new interview request related to a personnal evaluation. 
+                Click to create a new interview request related to a personal evaluation. 
               </p><p>
                 Interview requests are usually generated automatically by
                 OpenERP according to an employee's appraisal plan. Each user

From c9f803ff7441118d9ec58a9bbc605f81db8f5a70 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 19 Dec 2012 12:26:45 +0530
Subject: [PATCH 09/32] [IMP] Account : changed terms as suggested in account
 module

bzr revid: rpr@tinyerp.com-20121219065645-1cffyp8i4lqi083o
---
 addons/account/account.py                       | 10 +++++-----
 addons/account/account_invoice.py               |  6 +++---
 addons/account/account_menuitem.xml             |  2 +-
 addons/account/account_view.xml                 | 16 ++++++++--------
 addons/account/data/account_data.xml            |  2 +-
 addons/account/demo/account_demo.xml            |  2 +-
 addons/account/partner.py                       |  4 ++--
 addons/account/report/account_invoice_report.py |  2 +-
 addons/account/report/account_report.py         |  2 +-
 9 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index a724ebc3cc7..fe52decd9f3 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -56,9 +56,9 @@ def check_cycle(self, cr, uid, ids, context=None):
 
 class account_payment_term(osv.osv):
     _name = "account.payment.term"
-    _description = "Payment Term"
+    _description = "Payment Terms"
     _columns = {
-        'name': fields.char('Payment Term', size=64, translate=True, required=True),
+        'name': fields.char('Payment Terms', size=64, translate=True, required=True),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the payment term without removing it."),
         'note': fields.text('Description', translate=True),
         'line_ids': fields.one2many('account.payment.term.line', 'payment_id', 'Terms'),
@@ -101,7 +101,7 @@ class account_payment_term(osv.osv):
 
 class account_payment_term_line(osv.osv):
     _name = "account.payment.term.line"
-    _description = "Payment Term Line"
+    _description = "Payment Terms Line"
     _columns = {
         'value': fields.selection([('procent', 'Percent'),
                                    ('balance', 'Balance'),
@@ -112,7 +112,7 @@ class account_payment_term_line(osv.osv):
         'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
             "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
         'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
-        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True, ondelete='cascade'),
+        'payment_id': fields.many2one('account.payment.term', 'Payment Terms', required=True, select=True, ondelete='cascade'),
     }
     _defaults = {
         'value': 'balance',
@@ -128,7 +128,7 @@ class account_payment_term_line(osv.osv):
         return True
 
     _constraints = [
-        (_check_percent, 'Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2%.', ['value_amount']),
+        (_check_percent, 'Percentages for Payment Terms Line must be between 0 and 1, Example: 0.02 for 2%.', ['value_amount']),
     ]
 
 account_payment_term_line()
diff --git a/addons/account/account_invoice.py b/addons/account/account_invoice.py
index 3defd82d0ac..0c2cc2b46a7 100644
--- a/addons/account/account_invoice.py
+++ b/addons/account/account_invoice.py
@@ -222,7 +222,7 @@ class account_invoice(osv.osv):
             help="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."),
         'partner_id': fields.many2one('res.partner', 'Partner', change_default=True, readonly=True, required=True, states={'draft':[('readonly',False)]}),
-        'payment_term': fields.many2one('account.payment.term', 'Payment Term',readonly=True, states={'draft':[('readonly',False)]},
+        'payment_term': fields.many2one('account.payment.term', 'Payment Terms',readonly=True, states={'draft':[('readonly',False)]},
             help="If you use payment terms, the due date will be computed automatically at the generation "\
                 "of accounting entries. If you keep the payment term and the due date empty, it means direct payment. "\
                 "The payment term may compute several due dates, for example 50% now, 50% in one month."),
@@ -233,7 +233,7 @@ class account_invoice(osv.osv):
         'tax_line': fields.one2many('account.invoice.tax', 'invoice_id', 'Tax Lines', readonly=True, states={'draft':[('readonly',False)]}),
 
         'move_id': fields.many2one('account.move', 'Journal Entry', readonly=True, select=1, ondelete='restrict', help="Link to the automatically generated Journal Items."),
-        'amount_untaxed': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Untaxed',
+        'amount_untaxed': fields.function(_amount_all, digits_compute=dp.get_precision('Account'), string='Subtotal',
             store={
                 'account.invoice': (lambda self, cr, uid, ids, c={}: ids, ['invoice_line'], 20),
                 'account.invoice.tax': (_get_invoice_tax, None, 20),
@@ -1415,7 +1415,7 @@ class account_invoice_line(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', ondelete='set null', select=True),
         'account_id': fields.many2one('account.account', 'Account', required=True, domain=[('type','<>','view'), ('type', '<>', 'closed')], help="The income or expense account related to the selected product."),
         'price_unit': fields.float('Unit Price', required=True, digits_compute= dp.get_precision('Product Price')),
-        'price_subtotal': fields.function(_amount_line, string='Subtotal', type="float",
+        'price_subtotal': fields.function(_amount_line, string='Amount', type="float",
             digits_compute= dp.get_precision('Account'), store=True),
         'quantity': fields.float('Quantity', digits_compute= dp.get_precision('Product Unit of Measure'), required=True),
         'discount': fields.float('Discount (%)', digits_compute= dp.get_precision('Discount')),
diff --git a/addons/account/account_menuitem.xml b/addons/account/account_menuitem.xml
index d868043db64..f7bf33476bf 100644
--- a/addons/account/account_menuitem.xml
+++ b/addons/account/account_menuitem.xml
@@ -12,7 +12,7 @@
         <menuitem id="menu_finance_payables" name="Suppliers" parent="menu_finance" sequence="3"/>
         <menuitem id="menu_finance_bank_and_cash" name="Bank and Cash" parent="menu_finance" sequence="4"
             groups="group_account_user,group_account_manager"/>
-        <menuitem id="menu_finance_periodical_processing" name="Periodical Processing" parent="menu_finance" sequence="13" groups="group_account_user,group_account_manager"/>
+        <menuitem id="menu_finance_periodical_processing" name="Periodic Processing" parent="menu_finance" sequence="13" groups="group_account_user,group_account_manager"/>
         <!-- This menu is used in account_code module -->
         <menuitem id="menu_account_pp_statements" name="Statements" parent="menu_finance_periodical_processing" sequence="12"/>
         <menuitem id="periodical_processing_journal_entries_validation" name="Draft Entries" parent="menu_finance_periodical_processing"/>
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index adf7ac05067..a50b1d4e432 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1548,7 +1548,7 @@
             <field name="name">account.payment.term.line.tree</field>
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
-                <tree string="Payment Term">
+                <tree string="Payment Terms">
                     <field name="value"/>
                     <field name="value_amount" attrs="{'readonly':[('value','=','balance')]}"/>
                     <field name="days"/>
@@ -1560,7 +1560,7 @@
             <field name="name">account.payment.term.line.form</field>
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
-                <form string="Payment Term" version="7.0">
+                <form string="Payment Terms" version="7.0">
                     <group>
                         <group string="Amount Computation">
 	                        <field name="value"/>
@@ -1582,8 +1582,8 @@
             <field name="name">account.payment.term.search</field>
             <field name="model">account.payment.term</field>
             <field name="arch" type="xml">
-                <search string="Payment Term">
-                    <field name="name" string="Payment Term"/>
+                <search string="Payment Terms">
+                    <field name="name" string="Payment Terms"/>
                     <field name="active"/>
                 </search>
             </field>
@@ -1592,7 +1592,7 @@
             <field name="name">account.payment.term.form</field>
             <field name="model">account.payment.term</field>
             <field name="arch" type="xml">
-                <form string="Payment Term" version="7.0">
+                <form string="Payment Terms" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="active"/>
@@ -2296,17 +2296,17 @@
                                     <tree string="Opening Cashbox Lines" editable="bottom">
                                         <field name="pieces"/>
                                         <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
-                                        <field name="subtotal_opening" string="Opening Subtotal"/>
+                                        <field name="subtotal_opening" string="Opening Amount"/>
                                     </tree>
                                 </field>
                                 <field name="closing_details_ids" nolabel="1" colspan="4" attrs="{'invisible' : [('state', '=', 'draft')]}">
                                     <tree string="Closing Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
                                         <field name="number_opening" string="Opening Unit Numbers" readonly="1" />
-                                        <field name="subtotal_opening" string="Opening Subtotal" readonly="1" />
+                                        <field name="subtotal_opening" string="Opening Amount" readonly="1" />
 
                                         <field name="number_closing" string="Closing Unit Numbers" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
-                                        <field name="subtotal_closing" string="Closing Subtotal"/>
+                                        <field name="subtotal_closing" string="Closing Amount"/>
                                     </tree>
                                 </field>
                             </group>
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index f8a0fcdfcaa..24b4325020e 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -38,7 +38,7 @@
         </record>
 
         <record forcecreate="True" id="decimal_payment" model="decimal.precision">
-            <field name="name">Payment Term</field>
+            <field name="name">Payment Terms</field>
             <field name="digits">6</field>
         </record>
 
diff --git a/addons/account/demo/account_demo.xml b/addons/account/demo/account_demo.xml
index 6918ad44702..9ee821aab0f 100644
--- a/addons/account/demo/account_demo.xml
+++ b/addons/account/demo/account_demo.xml
@@ -128,7 +128,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         
-        <!-- Payment Term -->
+        <!-- Payment Terms -->
         
         <record id="account_payment_term" model="account.payment.term">
             <field name="name">30 Days End of Month</field>
diff --git a/addons/account/partner.py b/addons/account/partner.py
index 346cc38f5df..c2a8bcfc241 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -221,14 +221,14 @@ class res_partner(osv.osv):
             'account.payment.term',
             type='many2one',
             relation='account.payment.term',
-            string ='Customer Payment Term',
+            string ='Customer Payment Terms',
             view_load=True,
             help="This payment term will be used instead of the default one for sale orders and customer invoices"),
         'property_supplier_payment_term': fields.property(
             'account.payment.term',
              type='many2one',
              relation='account.payment.term',
-             string ='Supplier Payment Term',
+             string ='Supplier Payment Terms',
              view_load=True,
              help="This payment term will be used instead of the default one for purchase orders and supplier invoices"),
         'ref_companies': fields.one2many('res.company', 'partner_id',
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index af6ae1eede7..d98fc336e70 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -63,7 +63,7 @@ class account_invoice_report(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'product_qty':fields.float('Qty', readonly=True),
         'uom_name': fields.char('Reference Unit of Measure', size=128, readonly=True),
-        'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True),
+        'payment_term': fields.many2one('account.payment.term', 'Payment Terms', readonly=True),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index d6cc784c767..f3a974f09ea 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -164,7 +164,7 @@ class report_invoice_created(osv.osv):
             ],'Type', readonly=True),
         'number': fields.char('Invoice Number', size=32, readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-        'amount_untaxed': fields.float('Untaxed', readonly=True),
+        'amount_untaxed': fields.float('Subtotal', readonly=True),
         'amount_total': fields.float('Total', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
         'date_invoice': fields.date('Invoice Date', readonly=True),

From 90ff912d9845adeef932645348cdc28a34e28575 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 12:31:07 +0530
Subject: [PATCH 10/32] [FIX]account_voucher:string updated

bzr revid: kbh@tinyerp.com-20121219070107-e4909ff2hyas8cv7
---
 .../report/account_voucher_sales_receipt_view.xml         | 8 ++++----
 addons/account_voucher/voucher_sales_purchase_view.xml    | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
index fbd40ee17ba..e2be4939be8 100644
--- a/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
+++ b/addons/account_voucher/report/account_voucher_sales_receipt_view.xml
@@ -6,7 +6,7 @@
         <field name="name">sale.receipt.report.tree</field>
         <field name="model">sale.receipt.report</field>
         <field name="arch" type="xml">
-            <tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')" create="false"  string="Sales Receipt Analysis">
+            <tree colors="blue:state == 'draft';gray:state in ('cancel','paid');black:state in ('proforma','proforma2')" create="false"  string="Sales Receipts Analysis">
                 <field name="date" invisible="1"/>
                 <field name="user_id" invisible="1"/>
                 <field name="year" invisible="1"/>
@@ -33,7 +33,7 @@
          <field name="name">sale.receipt.report.graph</field>
          <field name="model">sale.receipt.report</field>
          <field name="arch" type="xml">
-             <graph string="Sales Receipt Analysis" type="bar">
+             <graph string="Sales Receipts Analysis" type="bar">
                  <field name="account_id"/>
                  <field name="price_total"/>
              </graph>
@@ -44,7 +44,7 @@
         <field name="name">sale.receipt.report.search</field>
         <field name="model">sale.receipt.report</field>
         <field name="arch" type="xml">
-            <search string="Sales Receipt Analysis">
+            <search string="Sales Receipts Analysis">
                 <field name="date"/>
                 <field name="date_due"/>
                 <filter string="Draft" icon="terp-document-new" domain="[('state','=','draft')]" help = "Draft Vouchers"/>
@@ -74,7 +74,7 @@
     </record>
 
     <record id="action_sale_receipt_report_all" model="ir.actions.act_window">
-        <field name="name">Sales Receipt Analysis</field>
+        <field name="name">Sales Receipts Analysis</field>
         <field name="res_model">sale.receipt.report</field>
         <field name="view_type">form</field>
         <field name="view_mode">tree,graph</field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 79e49575bf9..65e0c9362ba 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -68,7 +68,7 @@
                     <button name="action_cancel_draft" type="object" states="cancel" string="Set to Draft"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,posted" statusbar_colors='{"proforma":"blue"}'/>
                 </header>
-                <sheet string="Sales Receipt" >
+                <sheet string="Sales Receipts" >
                     <h1><label for="number" string="Sale Receipt"/> <field name="number" class="oe_inline" readonly="1"/></h1>
                     <group>
                         <group>
@@ -156,7 +156,7 @@
 
         <!-- Sales Voucher -->
         <record id="action_sale_receipt" model="ir.actions.act_window">
-            <field name="name">Sales Receipt</field>
+            <field name="name">Sales Receipts</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type','in',['sale','sale_refund']), ('type','=','sale')]</field>

From ca21c057ed0293f38616335801bb448fd5b27553 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 19 Dec 2012 12:34:15 +0530
Subject: [PATCH 11/32] [IMP] improve the string in fleet

bzr revid: rma@tinyerp.com-20121219070415-46l5zkbr2bjjamea
---
 addons/fleet/fleet.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/fleet/fleet.py b/addons/fleet/fleet.py
index 7474455d6d8..83f96bd71b5 100644
--- a/addons/fleet/fleet.py
+++ b/addons/fleet/fleet.py
@@ -124,7 +124,7 @@ class fleet_vehicle_state(osv.Model):
     _order = 'sequence asc'
     _columns = {
         'name': fields.char('Name', required=True),
-        'sequence': fields.integer('Order', help="Used to order the note stages")
+        'sequence': fields.integer('Sequence', help="Used to order the note stages")
     }
     _sql_constraints = [('fleet_state_name_unique','unique(name)', 'State name already exists')]
 

From f13f20dde641fc15a6875dd9e64ed13d9392b91b Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 12:35:53 +0530
Subject: [PATCH 12/32] [FIX]account_voucher:string updated

bzr revid: kbh@tinyerp.com-20121219070553-367g2qsv6kc4oj71
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 4 ++--
 addons/account_voucher/voucher_sales_purchase_view.xml  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index b6f367601ff..38b1425af92 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -250,7 +250,7 @@
         </record>
 
         <record id="action_vendor_payment" model="ir.actions.act_window">
-            <field name="name">Supplier Payment</field>
+            <field name="name">Supplier Payments</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','payment')]</field>
@@ -520,7 +520,7 @@
         </record>
 
         <record id="action_vendor_receipt" model="ir.actions.act_window">
-            <field name="name">Customer Payment</field>
+            <field name="name">Customer Payments</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt')]</field>
diff --git a/addons/account_voucher/voucher_sales_purchase_view.xml b/addons/account_voucher/voucher_sales_purchase_view.xml
index 65e0c9362ba..9a3841a13f0 100644
--- a/addons/account_voucher/voucher_sales_purchase_view.xml
+++ b/addons/account_voucher/voucher_sales_purchase_view.xml
@@ -46,7 +46,7 @@
         </record>
 
         <record id="act_pay_voucher" model="ir.actions.act_window">
-            <field name="name">Customer Payment</field>
+            <field name="name">Customer Payments</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type', 'in', ['bank', 'cash']), ('type','=','receipt'), ('partner_id','=',partner_id)]</field>
@@ -310,7 +310,7 @@
             </field>
         </record>
         <record id="action_purchase_receipt" model="ir.actions.act_window">
-            <field name="name">Purchase Receipt</field>
+            <field name="name">Purchase Receipts</field>
             <field name="res_model">account.voucher</field>
             <field name="view_type">form</field>
             <field name="domain">[('journal_id.type','in',['purchase','purchase_refund']), ('type','=','purchase')]</field>

From 27d1bc564a285017b0f034d97be922d53f50e5e9 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 19 Dec 2012 12:38:16 +0530
Subject: [PATCH 13/32] [IMP] improve the string in event_sale

bzr revid: rma@tinyerp.com-20121219070816-bpt7igqmv5u0mhbo
---
 addons/event_sale/__openerp__.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/event_sale/__openerp__.py b/addons/event_sale/__openerp__.py
index 2f191bad062..c274669af98 100644
--- a/addons/event_sale/__openerp__.py
+++ b/addons/event_sale/__openerp__.py
@@ -28,7 +28,7 @@
 Creating registration with sale orders.
 =======================================
 
-This module allows you to automatize and connect your registration creation with
+This module allows you to automate and connect your registration creation with
 your main sale flow and therefore, to enable the invoicing feature of registrations.
 
 It defines a new kind of service products that offers you the possibility to

From 335a29b9bb4f6c66cbcd736792797ee3be415eef Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 12:38:17 +0530
Subject: [PATCH 14/32] [FIX]mrp:menu string changed

bzr revid: kbh@tinyerp.com-20121219070817-re3yf4g4om44txu0
---
 addons/mrp/mrp_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mrp/mrp_view.xml b/addons/mrp/mrp_view.xml
index d5bc6d94507..f3bb5eef8eb 100644
--- a/addons/mrp/mrp_view.xml
+++ b/addons/mrp/mrp_view.xml
@@ -1031,7 +1031,7 @@
         <menuitem id="menu_mrp_planning" name="Planning"
                 parent="base.menu_mrp_root" sequence="2"/>
         <menuitem action="mrp.mrp_production_action_planning"
-                id="menu_mrp_production_order_action" name="Orders Planning"
+                id="menu_mrp_production_order_action" name="Order Planning"
                 parent="menu_mrp_planning" sequence="1"/>
 
 

From 0b12f3f529b3f1774f82068b6a1d9e3fb4671d28 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 12:41:52 +0530
Subject: [PATCH 15/32] [FIX]lunch:menu string changed

bzr revid: kbh@tinyerp.com-20121219071152-6pt50mt2ndsezsn7
---
 addons/lunch/lunch_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/lunch/lunch_view.xml b/addons/lunch/lunch_view.xml
index 1b1c1365415..a11fcc9693c 100644
--- a/addons/lunch/lunch_view.xml
+++ b/addons/lunch/lunch_view.xml
@@ -202,7 +202,7 @@
               </p>
             </field>
         </record>
-        <menuitem name="Employee's Payment" parent="menu_lunch_cash" id="menu_lunch_cashmove" action="action_lunch_cashmove" />
+        <menuitem name="Employee Payments" parent="menu_lunch_cash" id="menu_lunch_cashmove" action="action_lunch_cashmove" />
 
         <!--Action for Products-->
         <record model="ir.actions.act_window" id="action_lunch_products">

From c5dbfd5531db9d272dbbad659ee4bb3eb3242c10 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 19 Dec 2012 12:44:36 +0530
Subject: [PATCH 16/32] [IMP] improve the string in accounting_check_writing

bzr revid: rma@tinyerp.com-20121219071436-hfp09dntl89ap72d
---
 addons/account_check_writing/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account_check_writing/account.py b/addons/account_check_writing/account.py
index 1600898fc3a..62b7336dc5f 100644
--- a/addons/account_check_writing/account.py
+++ b/addons/account_check_writing/account.py
@@ -38,7 +38,7 @@ class res_company(osv.osv):
             ('top', 'Check on Top'),
             ('middle', 'Check in middle'),
             ('bottom', 'Check on bottom'),
-            ],"Choose Check layout",
+            ],"Check Layout",
             help="Check on top is compatible with Quicken, QuickBooks and Microsoft Money. Check in middle is compatible with Peachtree, ACCPAC and DacEasy. Check on bottom is compatible with Peachtree, ACCPAC and DacEasy only"  ),
         }
         

From bb43d29605b6121b0f9d36c1856f65705dd8a166 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 19 Dec 2012 12:55:37 +0530
Subject: [PATCH 17/32] [IMP] improve the string in account

bzr revid: rma@tinyerp.com-20121219072537-8szdtp4nmz5xr2hh
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index a724ebc3cc7..7b000aa32c2 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -705,7 +705,7 @@ class account_journal(osv.osv):
         'with_last_closing_balance' : fields.boolean('Opening With Last Closing Balance'),
         'name': fields.char('Journal Name', size=64, required=True),
         'code': fields.char('Code', size=5, required=True, help="The code will be displayed on reports."),
-        'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Cheques'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
+        'type': fields.selection([('sale', 'Sale'),('sale_refund','Sale Refund'), ('purchase', 'Purchase'), ('purchase_refund','Purchase Refund'), ('cash', 'Cash'), ('bank', 'Bank and Checks'), ('general', 'General'), ('situation', 'Opening/Closing Situation')], 'Type', size=32, required=True,
                                  help="Select 'Sale' for customer invoices journals."\
                                  " Select 'Purchase' for supplier invoices journals."\
                                  " Select 'Cash' or 'Bank' for journals that are used in customer or supplier payments."\

From 0d8b9619053ac05bdca4788d2c1b0aac2901d8cf Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 19 Dec 2012 12:59:15 +0530
Subject: [PATCH 18/32] [IMP] improve the string in account

bzr revid: rma@tinyerp.com-20121219072915-bd84k8220m6dsgm1
---
 addons/account/account.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 7b000aa32c2..5f20c858cf8 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -715,7 +715,7 @@ class account_journal(osv.osv):
         'account_control_ids': fields.many2many('account.account', 'account_account_type_rel', 'journal_id','account_id', 'Account', domain=[('type','<>','view'), ('type', '<>', 'closed')]),
         'default_credit_account_id': fields.many2one('account.account', 'Default Credit Account', domain="[('type','!=','view')]", help="It acts as a default account for credit amount"),
         'default_debit_account_id': fields.many2one('account.account', 'Default Debit Account', domain="[('type','!=','view')]", help="It acts as a default account for debit amount"),
-        'centralisation': fields.boolean('Centralised Counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
+        'centralisation': fields.boolean('Centralized Counterpart', help="Check this box to determine that each entry of this journal won't create a new counterpart but will share the same counterpart. This is used in fiscal year closing."),
         'update_posted': fields.boolean('Allow Cancelling Entries', help="Check this box if you want to allow the cancellation the entries related to this journal or of the invoice related to this journal"),
         'group_invoice_lines': fields.boolean('Group Invoice Lines', help="If this box is checked, the system will try to group the accounting lines when generating them from invoices."),
         'sequence_id': fields.many2one('ir.sequence', 'Entry Sequence', help="This field contains the information related to the numbering of the journal entries of this journal.", required=True),

From a19915e805fd431fbd3da32ff5fc8ed3703601a5 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 14:57:10 +0530
Subject: [PATCH 19/32] [FIX]leaves replaced by Time off

bzr revid: kbh@tinyerp.com-20121219092710-i9x9j0c6iykix4d6
---
 .../account/project/analytic_account_demo.xml |  2 +-
 addons/hr/hr_data.xml                         |  2 +-
 addons/hr/hr_department_view.xml              |  2 +-
 addons/hr/hr_installer.xml                    |  2 +-
 addons/hr/res_config.py                       |  2 +-
 addons/hr_holidays/__openerp__.py             | 12 +++----
 addons/hr_holidays/board_hr_holidays_view.xml |  4 +--
 addons/hr_holidays/hr_holidays.py             | 14 ++++----
 addons/hr_holidays/hr_holidays_data.xml       |  8 ++---
 addons/hr_holidays/hr_holidays_report.xml     |  2 +-
 addons/hr_holidays/hr_holidays_view.xml       | 34 +++++++++----------
 .../report/available_holidays_view.xml        |  4 +--
 .../hr_holidays/report/holidays_summary.xsl   |  4 +--
 .../report/hr_holidays_report_view.xml        |  4 +--
 addons/hr_holidays/test/test_hr_holiday.yml   |  2 +-
 .../wizard/hr_holidays_summary_department.py  |  2 +-
 .../hr_holidays_summary_department_view.xml   |  6 ++--
 .../wizard/hr_holidays_summary_employees.py   |  2 +-
 .../hr_holidays_summary_employees_view.xml    |  6 ++--
 addons/resource/__openerp__.py                |  2 +-
 addons/resource/resource.py                   |  8 ++---
 addons/resource/resource_view.xml             |  6 ++--
 22 files changed, 65 insertions(+), 65 deletions(-)

diff --git a/addons/account/project/analytic_account_demo.xml b/addons/account/project/analytic_account_demo.xml
index 2c4acc6bc45..462c20e7b11 100644
--- a/addons/account/project/analytic_account_demo.xml
+++ b/addons/account/project/analytic_account_demo.xml
@@ -5,7 +5,7 @@
             <field name="name" model="res.company" use="name" search="[]"/>
         </record>
         <record id="analytic_absences" model="account.analytic.account">
-            <field name="name">Leaves</field>
+            <field name="name">Time off</field>
             <field name="type">view</field>
             <field name="parent_id" ref="analytic_root"/>
         </record>
diff --git a/addons/hr/hr_data.xml b/addons/hr/hr_data.xml
index 25c882f2201..b129af8c332 100644
--- a/addons/hr/hr_data.xml
+++ b/addons/hr/hr_data.xml
@@ -10,7 +10,7 @@
             <field name="subject">Employee Directory application installed!</field>
             <field name="body"><![CDATA[<p>Manage your human resources with OpenERP: employees and their hierarchy, HR departments and job positions.</p>
 <p>More HR features are available via extra applications: Recruitment Process (manage job positions and recruitment), Timesheet Validation (record timesheets and attendance),
-Leave Management (keep track of employee leaves), Expense Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager).</p>]]></field>
+Leave Management (keep track of employee Time off), Expense Management (manage employee expenses), Employee Appraisals (organize employee surveys, where employees evaluate their subordinates or their manager).</p>]]></field>
         </record>
 
         <record id="employee" model="hr.employee">
diff --git a/addons/hr/hr_department_view.xml b/addons/hr/hr_department_view.xml
index 6ea43e45b66..e43e37a91b3 100644
--- a/addons/hr/hr_department_view.xml
+++ b/addons/hr/hr_department_view.xml
@@ -53,7 +53,7 @@
               </p><p>
                 OpenERP's department structure is used to manage all documents
                 related to employees by departments: expenses, timesheets,
-                leaves and holidays, recruitments, etc.
+                Time off and holidays, recruitments, etc.
               </p>
             </field>
         </record>
diff --git a/addons/hr/hr_installer.xml b/addons/hr/hr_installer.xml
index 1296029b941..20abb9682aa 100644
--- a/addons/hr/hr_installer.xml
+++ b/addons/hr/hr_installer.xml
@@ -14,7 +14,7 @@
               </p><p>
                 Your departments structure is used to manage all documents
                 related to employees by departments: expenses and timesheets,
-                leaves and holidays, recruitments, etc.
+                Time off and holidays, recruitments, etc.
               </p>
             </field>
         </record>
diff --git a/addons/hr/res_config.py b/addons/hr/res_config.py
index 147c4e4d5b9..d822ed6cbb2 100644
--- a/addons/hr/res_config.py
+++ b/addons/hr/res_config.py
@@ -32,7 +32,7 @@ class hr_config_settings(osv.osv_memory):
             help ="""This installs the module hr_attendance."""),
         'module_hr_timesheet': fields.boolean('Manage timesheets',
             help ="""This installs the module hr_timesheet."""),
-        'module_hr_holidays': fields.boolean('Manage holidays, leaves and allocation requests',
+        'module_hr_holidays': fields.boolean('Manage holidays, Time off and allocation requests',
             help ="""This installs the module hr_holidays."""),
         'module_hr_expense': fields.boolean('Manage employees expenses',
             help ="""This installs the module hr_expense."""),
diff --git a/addons/hr_holidays/__openerp__.py b/addons/hr_holidays/__openerp__.py
index 417748d874b..9350a5de9ff 100644
--- a/addons/hr_holidays/__openerp__.py
+++ b/addons/hr_holidays/__openerp__.py
@@ -29,18 +29,18 @@
     'summary': 'Holidays, Allocation and Leave Requests',
     'website': 'http://www.openerp.com',
     'description': """
-Manage leaves and allocation requests
+Manage Time off and allocation requests
 =====================================
 
 This application controls the holiday schedule of your company. It allows employees to request holidays. Then, managers can review requests for holidays and approve or reject them. This way you can control the overall holiday planning for the company or department.
 
-You can configure several kinds of leaves (sickness, holidays, paid days, ...) and allocate leaves to an employee or department quickly using allocation requests. An employee can also make a request for more days off by making a new Allocation. It will increase the total of available days for that leave type (if the request is accepted).
+You can configure several kinds of Time off (sickness, holidays, paid days, ...) and allocate Time off to an employee or department quickly using allocation requests. An employee can also make a request for more days off by making a new Allocation. It will increase the total of available days for that leave type (if the request is accepted).
 
-You can keep track of leaves in different ways by following reports: 
+You can keep track of Time off in different ways by following reports: 
 
-* Leaves Summary
-* Leaves by Department
-* Leaves Analysis
+* Time off Summary
+* Time off by Department
+* Time off Analysis
 
 A synchronization with an internal agenda (Meetings of the CRM module) is also possible in order to automatically create a meeting when a holiday request is accepted by setting up a type of meeting in Leave Type.
 """,
diff --git a/addons/hr_holidays/board_hr_holidays_view.xml b/addons/hr_holidays/board_hr_holidays_view.xml
index c90ee32c396..3c8e1e50c22 100644
--- a/addons/hr_holidays/board_hr_holidays_view.xml
+++ b/addons/hr_holidays/board_hr_holidays_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <record model="ir.actions.act_window" id="action_hr_holidays_leaves_by_month">
-            <field name="name">My Leaves</field>
+            <field name="name">My Time off</field>
             <field name="res_model">hr.holidays.status</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -18,7 +18,7 @@
             <field name="inherit_id" ref="hr.board_hr_form"/>
             <field name="arch" type="xml">
                 <xpath expr="/form/board/column[1]" position="inside">
-                    <action name="%(action_hr_holidays_leaves_by_month)d" string="My Leaves"/>
+                    <action name="%(action_hr_holidays_leaves_by_month)d" string="My Time off"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays.py b/addons/hr_holidays/hr_holidays.py
index 630bce14e91..5d4f80ebca3 100644
--- a/addons/hr_holidays/hr_holidays.py
+++ b/addons/hr_holidays/hr_holidays.py
@@ -79,11 +79,11 @@ class hr_holidays_status(osv.osv):
         'categ_id': fields.many2one('crm.meeting.type', 'Meeting Type',
             help='Once a leave is validated, OpenERP will create a corresponding meeting of this type in the calendar.'),
         'color_name': fields.selection([('red', 'Red'),('blue','Blue'), ('lightgreen', 'Light Green'), ('lightblue','Light Blue'), ('lightyellow', 'Light Yellow'), ('magenta', 'Magenta'),('lightcyan', 'Light Cyan'),('black', 'Black'),('lightpink', 'Light Pink'),('brown', 'Brown'),('violet', 'Violet'),('lightcoral', 'Light Coral'),('lightsalmon', 'Light Salmon'),('lavender', 'Lavender'),('wheat', 'Wheat'),('ivory', 'Ivory')],'Color in Report', required=True, help='This color will be used in the leaves summary located in Reporting\Leaves by Department.'),
-        'limit': fields.boolean('Allow to Override Limit', help='If you select this check box, the system allows the employees to take more leaves than the available ones for this type and take them into account for the "Remaining Legal Leaves" defined on the employee form.'),
+        'limit': fields.boolean('Allow to Override Limit', help='If you select this check box, the system allows the employees to take more Time off than the available ones for this type and take them into account for the "Remaining Legal Time off" defined on the employee form.'),
         'active': fields.boolean('Active', help="If the active field is set to false, it will allow you to hide the leave type without removing it."),
         'max_leaves': fields.function(_user_left_days, string='Maximum Allowed', help='This value is given by the sum of all holidays requests with a positive value.', multi='user_left_days'),
-        'leaves_taken': fields.function(_user_left_days, string='Leaves Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
-        'remaining_leaves': fields.function(_user_left_days, string='Remaining Leaves', help='Maximum Leaves Allowed - Leaves Already Taken', multi='user_left_days'),
+        'leaves_taken': fields.function(_user_left_days, string='Time off Already Taken', help='This value is given by the sum of all holidays requests with a negative value.', multi='user_left_days'),
+        'remaining_leaves': fields.function(_user_left_days, string='Remaining Time off', help='Maximum Time off Allowed - Time off Already Taken', multi='user_left_days'),
         'double_validation': fields.boolean('Apply Double Validation', help="When selected, the Allocation/Leave Requests for this type require a second validation to be approved."),
     }
     _defaults = {
@@ -149,7 +149,7 @@ class hr_holidays(osv.osv):
         'number_of_days_temp': fields.float('Allocation', readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}),
         'number_of_days': fields.function(_compute_number_of_days, string='Number of Days', store=True),
         'meeting_id': fields.many2one('crm.meeting', 'Meeting'),
-        'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of leaves available for someone", select=True),
+        'type': fields.selection([('remove','Leave Request'),('add','Allocation Request')], 'Request Type', required=True, readonly=True, states={'draft':[('readonly',False)], 'confirm':[('readonly',False)]}, help="Choose 'Leave Request' if someone wants to take an off-day. \nChoose 'Allocation Request' if you want to increase the number of Time off available for someone", select=True),
         'parent_id': fields.many2one('hr.holidays', 'Parent'),
         'linked_request_ids': fields.one2many('hr.holidays', 'parent_id', 'Linked Requests',),
         'department_id':fields.related('employee_id', 'department_id', string='Department', type='many2one', relation='hr.department', readonly=True, store=True),
@@ -166,7 +166,7 @@ class hr_holidays(osv.osv):
         'holiday_type': 'employee'
     }
     _constraints = [
-        (_check_date, 'You can not have 2 leaves that overlaps on same day!', ['date_from','date_to']),
+        (_check_date, 'You can not have 2 Time off that overlaps on same day!', ['date_from','date_to']),
     ] 
     
     _sql_constraints = [
@@ -482,7 +482,7 @@ class hr_employee(osv.osv):
         # Find for holidays status
         status_ids = type_obj.search(cr, uid, [('limit', '=', False)], context=context)
         if len(status_ids) != 1 :
-            raise osv.except_osv(_('Warning!'),_("The feature behind the field 'Remaining Legal Leaves' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \nYou may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in 'Human Resources \ Leaves' to manage the leave days of the employees if the configuration does not allow to use this field.") % (len(status_ids)))
+            raise osv.except_osv(_('Warning!'),_("The feature behind the field 'Remaining Legal Time off' can only be used when there is only one leave type with the option 'Allow to Override Limit' unchecked. (%s Found). Otherwise, the update is ambiguous as we cannot decide on which leave type the update has to be done. \nYou may prefer to use the classic menus 'Leave Requests' and 'Allocation Requests' located in 'Human Resources \ Leaves' to manage the leave days of the employees if the configuration does not allow to use this field.") % (len(status_ids)))
         status_id = status_ids and status_ids[0] or False
         if not status_id:
             return False
@@ -541,7 +541,7 @@ class hr_employee(osv.osv):
         return result
 
     _columns = {
-        'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Leaves', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave request. Total based on all the leave types without overriding limit.'),
+        'remaining_leaves': fields.function(_get_remaining_days, string='Remaining Legal Time off', fnct_inv=_set_remaining_days, type="float", help='Total number of legal leaves allocated to this employee, change this value to create allocation/leave request. Total based on all the leave types without overriding limit.'),
         'current_leave_state': fields.function(_get_leave_status, multi="leave_status", string="Current Leave Status", type="selection",
             selection=[('draft', 'New'), ('confirm', 'Waiting Approval'), ('refuse', 'Refused'),
             ('validate1', 'Waiting Second Approval'), ('validate', 'Approved'), ('cancel', 'Cancelled')]),
diff --git a/addons/hr_holidays/hr_holidays_data.xml b/addons/hr_holidays/hr_holidays_data.xml
index 5af0c60fc44..e04c680d531 100644
--- a/addons/hr_holidays/hr_holidays_data.xml
+++ b/addons/hr_holidays/hr_holidays_data.xml
@@ -13,20 +13,20 @@
             <field name="type">notification</field>
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Leave Management application installed!</field>
-            <field name="body"><![CDATA[<p>Manage employee leaves from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR officers.</p>
-<p>Once validated, they are visible in the employee's calendar. HR officers can define leave types and allocate leaves to employees and employee categories.</p>]]></field>
+            <field name="body"><![CDATA[<p>Manage employee Time off from the top menu "Human Resources". Employees can create leave requests that are validated by their manager and/or HR officers.</p>
+<p>Once validated, they are visible in the employee's calendar. HR officers can define leave types and allocate Time off to employees and employee categories.</p>]]></field>
         </record>
 
 
         <!-- Casual leave -->
         <record model="hr.holidays.status" id="holiday_status_cl">
-            <field name="name" eval="'Legal Leaves '+time.strftime('%Y')"/>
+            <field name="name" eval="'Legal Time off '+time.strftime('%Y')"/>
             <field name="color_name">black</field>
         </record>
 
         <!-- Sick leave -->
         <record model="hr.holidays.status" id="holiday_status_sl">
-            <field name="name">Sick Leaves</field>
+            <field name="name">Sick Time off</field>
             <field name="limit">True</field>
             <field name="color_name">red</field>
         </record>
diff --git a/addons/hr_holidays/hr_holidays_report.xml b/addons/hr_holidays/hr_holidays_report.xml
index 14d4cb99562..79a49fe4fab 100644
--- a/addons/hr_holidays/hr_holidays_report.xml
+++ b/addons/hr_holidays/hr_holidays_report.xml
@@ -3,7 +3,7 @@
     <data>
 
         <report id="report_holidays_summary"
-                string="Leaves Summary"
+                string="Time off Summary"
                 model="hr.holidays"
                 name="holidays.summary"
                 xsl="hr_holidays/report/holidays_summary.xsl"
diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index f8b4ad07b77..a0d49eff4e9 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -14,9 +14,9 @@
                     <separator/>
                     <filter icon="terp-go-year" name="year" string="Year" domain="[('holiday_status_id.active','=',True)]" help="Filters only on allocations and requests that belong to an holiday type that is 'active' (active field is True)"/>
                     <separator/>
-                    <filter string="My Leaves" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Leaves"/>
+                    <filter string="My Time off" icon="terp-personal" name="my_leaves" domain="[('employee_id.user_id','=', uid)]" help="My Time off"/>
                     <separator/>
-                    <filter string="My Department Leaves" icon="terp-personal+" help="My Department Leaves" domain="[('department_id.manager_id','=',uid)]"/>
+                    <filter string="My Department Time off" icon="terp-personal+" help="My Department Time off" domain="[('department_id.manager_id','=',uid)]"/>
                     <field name="employee_id"/>
                     <field name="department_id"/>
                     <field name="holiday_status_id"/>
@@ -154,10 +154,10 @@
 
         <!-- Holidays: Leaves Management -->
         <record model="ir.ui.view" id="allocation_company_new">
-            <field name="name">Leaves Management</field>
+            <field name="name">Time off Management</field>
             <field name="model">hr.holidays</field>
             <field name="arch" type="xml">
-                <form string="Leaves Management" version="7.0">
+                <form string="Time off Management" version="7.0">
                     <header>
                         <button string="Submit to Manager" name="confirm" states="draft" type="workflow" icon="gtk-yes"/>
                         <button string="Approve" name="validate" states="confirm" type="workflow" icon="gtk-apply"/>
@@ -183,7 +183,7 @@
             <field name="model">hr.holidays</field>
             <field name="priority">20</field>
             <field name="arch" type="xml">
-                <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Leaves Summary">
+                <tree colors="red:state == 'refuse';blue:state == ' draft';black:state in ('confirm','validate','validate1')" string="Time off Summary">
                     <field name="employee_id"/>
                     <field name="category_id" invisible="1"/>
                     <field name="department_id" invisible="1"/>
@@ -221,7 +221,7 @@
             </field>
         </record>
 
-        <menuitem name="Leaves" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/>
+        <menuitem name="Time off" parent="hr.menu_hr_root" id="menu_open_ask_holidays" sequence="20"/>
 
         <record model="ir.actions.act_window" id="open_ask_holidays">
             <field name="name">Leave Requests</field>
@@ -345,7 +345,7 @@
         <menuitem parent="menu_open_ask_holidays" id="menu_request_approve_allocation" action="request_approve_allocation" groups="base.group_hr_manager"/>
 
         <record model="ir.actions.act_window" id="open_company_allocation">
-            <field name="name">Leaves Summary</field>
+            <field name="name">Time off Summary</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -355,7 +355,7 @@
             <field name="search_view_id" ref="view_hr_holidays_filter"/>
         </record>
 
-        <menuitem name="Leaves Summary" parent="menu_open_ask_holidays" id="menu_open_company_allocation" action="open_company_allocation" sequence="40"/>
+        <menuitem name="Time off Summary" parent="menu_open_ask_holidays" id="menu_open_company_allocation" action="open_company_allocation" sequence="40"/>
 
         <!-- Holidays status -->
         <record id="view_holidays_status_filter" model="ir.ui.view">
@@ -442,8 +442,8 @@
             <field name="search_view_id" ref="view_hr_holidays_status_search"/>
         </record>
 
-        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
-        <menuitem name="Leaves Types" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10"/>
+        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Time off"/>
+        <menuitem name="Time off Types" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10"/>
 
         <!-- Holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">
@@ -459,7 +459,7 @@
 
         <!-- Shortcuts -->
         <record id="act_hr_employee_holiday_request" model="ir.actions.act_window">
-            <field name="name">Leaves</field>
+            <field name="name">Time off</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays</field>
             <field name="src_model">hr.employee</field>
@@ -476,15 +476,15 @@
             <field name="model">hr.employee</field>
             <field name="priority" eval="20"/>
             <field name="arch" type="xml">
-                <tree string="Assign Leaves" editable="bottom">
+                <tree string="Assign Time off" editable="bottom">
                     <field name="name" string="Employee"/>
-                    <field name="remaining_leaves" string="Remaining Legal Leaves"/>
+                    <field name="remaining_leaves" string="Remaining Legal Time off"/>
                 </tree>
             </field>
         </record>
 
         <record model="ir.actions.act_window" id="hr_holidays_leaves_assign_legal">
-           <field name="name">Allocate Leaves for Employees</field>
+           <field name="name">Allocate Time off for Employees</field>
            <field name="type">ir.actions.act_window</field>
            <field name="res_model">hr.employee</field>
            <field name="view_type">form</field>
@@ -492,7 +492,7 @@
            <field name="view_id" ref="hr_holidays_leaves_assign_tree_view"/>
            <field name="help" type="html">
              <p>
-               You can assign remaining Legal Leaves for each employee, OpenERP
+               You can assign remaining Legal Time off for each employee, OpenERP
                will automatically create and validate allocation requests.
              </p>
            </field>
@@ -505,7 +505,7 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group[@name='active_group']" position="before">
-                    <group string="Leaves">
+                    <group string="Time off">
                         <label for="remaining_leaves"/>
                         <div>
                             <field name="remaining_leaves" class="oe_inline"/> days
@@ -513,7 +513,7 @@
                     </group>
                 </xpath>
                 <xpath expr="//div[@name='button_box']" position="inside">
-                    <button name="%(act_hr_employee_holiday_request)d" string="Leaves" type="action" groups="base.group_hr_user"/>
+                    <button name="%(act_hr_employee_holiday_request)d" string="Time off" type="action" groups="base.group_hr_user"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/hr_holidays/report/available_holidays_view.xml b/addons/hr_holidays/report/available_holidays_view.xml
index e7441060204..78b9860ff09 100644
--- a/addons/hr_holidays/report/available_holidays_view.xml
+++ b/addons/hr_holidays/report/available_holidays_view.xml
@@ -3,7 +3,7 @@
     <data>
 
         <record model="ir.actions.act_window" id="action_hr_available_holidays_report">
-            <field name="name">Leaves Analysis</field>
+            <field name="name">Time off Analysis</field>
             <field name="res_model">hr.holidays</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
@@ -14,7 +14,7 @@
         </record>
 
         <menuitem
-            name="Leaves Analysis" 
+            name="Time off Analysis" 
             id="menu_hr_available_holidays_report_tree" 
             action="action_hr_available_holidays_report" 
             parent="hr.menu_hr_reporting" sequence="5" />
diff --git a/addons/hr_holidays/report/holidays_summary.xsl b/addons/hr_holidays/report/holidays_summary.xsl
index 4d83cd9cdc7..0e6fabbd746 100644
--- a/addons/hr_holidays/report/holidays_summary.xsl
+++ b/addons/hr_holidays/report/holidays_summary.xsl
@@ -149,9 +149,9 @@
             </tr>
         </blockTable>
         <spacer length="1.0cm" />
-        <para style="title" t="1">Leaves Summary <xsl:value-of select="report/name" /></para>
+        <para style="title" t="1">Time off Summary <xsl:value-of select="report/name" /></para>
         <spacer length="0.5cm" />
-        <para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> leaves. </para>
+        <para style="normal-title" t="1">Analyze from <u><xsl:value-of select="report/from" /></u> to <u> <xsl:value-of select="report/to" /> </u> of the <u><xsl:value-of select="report/type" /></u> Time off. </para>
         <spacer length="1.0cm" />
         <xsl:variable name="cols_legend">
             <xsl:text>0.7cm,5.0cm</xsl:text>
diff --git a/addons/hr_holidays/report/hr_holidays_report_view.xml b/addons/hr_holidays/report/hr_holidays_report_view.xml
index 8af7075f109..a0e019be2d7 100644
--- a/addons/hr_holidays/report/hr_holidays_report_view.xml
+++ b/addons/hr_holidays/report/hr_holidays_report_view.xml
@@ -6,7 +6,7 @@
         <field name="name">hr.holidays.remaining.leaves.user.tree</field>
         <field name="model">hr.holidays.remaining.leaves.user</field>
         <field name="arch" type="xml">
-            <tree string="Leaves by Type">
+            <tree string="Time off by Type">
                 <field name="name"/>
                 <field name="leave_type"/>
                 <field name="no_of_leaves"/>
@@ -18,7 +18,7 @@
         <field name="name">hr.holidays.remaining.leaves.user.graph</field>
         <field name="model">hr.holidays.remaining.leaves.user</field>
         <field name="arch" type="xml">
-            <graph string="Leaves by Type" orientation = "horizontal" type="bar">
+            <graph string="Time off by Type" orientation = "horizontal" type="bar">
                 <field name="name" />
                 <field name="no_of_leaves" operator = "+"/>
                 <field name="leave_type" group = "True"/>
diff --git a/addons/hr_holidays/test/test_hr_holiday.yml b/addons/hr_holidays/test/test_hr_holiday.yml
index f0e85d552cb..fc6cb9a5137 100644
--- a/addons/hr_holidays/test/test_hr_holiday.yml
+++ b/addons/hr_holidays/test/test_hr_holiday.yml
@@ -1,5 +1,5 @@
 -
-  In order to test the hr_holiday module in OpenERP, I will  Allocate leaves for Employee and manage leaves and leaves requests.
+  In order to test the hr_holiday module in OpenERP, I will  Allocate Time off for Employee and manage Time off and Time off requests.
 -
   I assign the dates in the holiday request.
 -
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department.py b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
index ef1cb8f9e6f..b4fa19fa27a 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department.py
@@ -26,7 +26,7 @@ from openerp.tools.translate import _
 
 class hr_holidays_summary_dept(osv.osv_memory):
     _name = 'hr.holidays.summary.dept'
-    _description = 'HR Leaves Summary Report By Department'
+    _description = 'HR Time off Summary Report By Department'
     _columns = {
         'date_from': fields.date('From', required=True),
         'depts': fields.many2many('hr.department', 'summary_dept_rel', 'sum_id', 'dept_id', 'Department(s)'),
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
index d5847fa54ee..bb0bfe7832d 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_department_view.xml
@@ -6,7 +6,7 @@
             <field name="name">hr.holidays.summary.dept.form</field>
             <field name="model">hr.holidays.summary.dept</field>
             <field name="arch" type="xml">
-            <form string="Leaves by Department" version="7.0">
+            <form string="Time off by Department" version="7.0">
                 <group>
                     <field name="date_from" />
                     <field name="holiday_type"/>
@@ -21,7 +21,7 @@
         </record>
 
         <record id="action_hr_holidays_summary_dept" model="ir.actions.act_window">
-            <field name="name">Leaves by Department</field>
+            <field name="name">Time off by Department</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.summary.dept</field>
             <field name="view_type">form</field>
@@ -30,7 +30,7 @@
         </record>
 
         <menuitem
-            name="Leaves by Department"
+            name="Time off by Department"
             parent="hr.menu_hr_reporting_timesheet"
             action="action_hr_holidays_summary_dept"
             id="menu_account_central_journal"
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
index 1897d82c882..e5b9c84a26e 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees.py
@@ -24,7 +24,7 @@ from openerp.osv import fields, osv
 
 class hr_holidays_summary_employee(osv.osv_memory):
     _name = 'hr.holidays.summary.employee'
-    _description = 'HR Leaves Summary Report By Employee'
+    _description = 'HR Time off Summary Report By Employee'
     _columns = {
         'date_from': fields.date('From', required=True),
         'emp': fields.many2many('hr.employee', 'summary_emp_rel', 'sum_id', 'emp_id', 'Employee(s)'),
diff --git a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
index d7b46f38e6d..790541ba8c3 100644
--- a/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
+++ b/addons/hr_holidays/wizard/hr_holidays_summary_employees_view.xml
@@ -6,7 +6,7 @@
             <field name="name">hr.holidays.summary.employee.form</field>
             <field name="model">hr.holidays.summary.employee</field>
             <field name="arch" type="xml">
-                <form string="Leaves Summary" version="7.0">
+                <form string="Time off Summary" version="7.0">
                     <group col="4" colspan="6">
                         <field name="date_from"/>
                         <newline/>
@@ -24,7 +24,7 @@
         </record>
 
         <record id="action_hr_holidays_summary_employee" model="ir.actions.act_window">
-            <field name="name">Leaves Summary</field>
+            <field name="name">Time off Summary</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">hr.holidays.summary.employee</field>
             <field name="view_type">form</field>
@@ -34,7 +34,7 @@
 
         <record model="ir.values" id="hr_holidays_summary_employee_value">
             <field name="model_id" ref="hr.model_hr_employee" />
-            <field name="name">Leaves Summary</field>
+            <field name="name">Time off Summary</field>
             <field name="key2">client_print_multi</field>
             <field name="value" eval="'ir.actions.act_window,' + str(ref('action_hr_holidays_summary_employee'))" />
             <field name="key">action</field>
diff --git a/addons/resource/__openerp__.py b/addons/resource/__openerp__.py
index b8a9f57c910..45eeede382b 100644
--- a/addons/resource/__openerp__.py
+++ b/addons/resource/__openerp__.py
@@ -31,7 +31,7 @@ Module for resource management.
 
 A resource represent something that can be scheduled (a developer on a task or a
 work center on manufacturing orders). This module manages a resource calendar
-associated to every resource. It also manages the leaves of every resource.
+associated to every resource. It also manages the Time off of every resource.
     """,
     'author': 'OpenERP SA',
     'website': 'http://www.openerp.com',
diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 727ca93d7c9..5386c603f09 100644
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -58,10 +58,10 @@ class resource_calendar(osv.osv):
         return res
 
     def _get_leaves(self, cr, uid, id, resource):
-        """Private Method to Calculate resource Leaves days
+        """Private Method to Calculate resource Time off days
 
         @param id: resource calendar id
-        @param resource: resource id for which leaves will ew calculated
+        @param resource: resource id for which Time off will ew calculated
 
         @return : returns the list of dates, where resource on leave in
                   resource.calendar.leaves object (e.g.['%Y-%m-%d', '%Y-%m-%d'])
@@ -91,7 +91,7 @@ class resource_calendar(osv.osv):
         @param dt_from: datetime object, start of working scheduled
         @param hours: float, total number working  hours needed scheduled from
                       start date
-        @param resource : Optional Resource id, if supplied than resource leaves
+        @param resource : Optional Resource id, if supplied than resource Time off
                         will also taken into consideration for calculating working
                         schedule.
         @return : List datetime object of working schedule based on supplies
@@ -202,7 +202,7 @@ class resource_calendar(osv.osv):
     def interval_hours_get(self, cr, uid, id, dt_from, dt_to, resource=False):
         """ Calculates the Total Working hours based on given start_date to
         end_date, If resource id is supplied that it will consider the source
-        leaves also in calculating the hours.
+        Time off also in calculating the hours.
 
         @param dt_from : date start to calculate hours
         @param dt_end : date end to calculate hours
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 58f7789dc07..62b9f3045d0 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -40,7 +40,7 @@
             <field name="name">resource.calendar.leaves.search</field>
             <field name="model">resource.calendar.leaves</field>
             <field name="arch" type="xml">
-                <search string="Search Working Period Leaves">
+                <search string="Search Working Period Time off">
                     <field name="name" string="Reason"/>
                     <field name="resource_id" string="Resource"/>
                     <field name="company_id" string="Company" groups="base.group_multi_company"/>
@@ -146,7 +146,7 @@
 
         <act_window
             id="resource_calendar_resources_leaves"
-            name="Resources Leaves"
+            name="Resources Time off"
             res_model="resource.calendar.leaves"
             src_model="resource.calendar"
             view_mode="calendar,tree,form"
@@ -242,7 +242,7 @@
             </field>
         </record>
         <record id="action_resource_calendar_leave_tree" model="ir.actions.act_window">
-            <field name="name">Resource Leaves</field>
+            <field name="name">Resource Time off</field>
             <field name="res_model">resource.calendar.leaves</field>
             <field name="view_mode">tree,form,calendar</field>
             <field name="search_view_id" ref="view_resource_calendar_leaves_search"/>

From bbefec242daddf752d0957e910540cc90ad9d793 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 19 Dec 2012 15:05:47 +0530
Subject: [PATCH 20/32] [IMP] improve the string mail_group_data

bzr revid: rma@tinyerp.com-20121219093547-9hem1n0190qv8m5z
---
 addons/mail/data/mail_group_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml
index 84258d619ba..d61c883f447 100644
--- a/addons/mail/data/mail_group_data.xml
+++ b/addons/mail/data/mail_group_data.xml
@@ -16,7 +16,7 @@
             <field name="subtype_id" ref="mail.mt_comment"/>
             <field name="subject">Welcome to OpenERP!</field>
             <field name="body"><![CDATA[<p>Your homepage is a summary of messages you received and key information about documents you follow.</p>
-            <p>The top menu bar contains all applications you installed. You can use the <i>Settings</i> menu to install more applications, activate others features or give access to new users.</p>
+            <p>The top menu bar contains all applications you installed. You can use the <i>Settings</i> menu to install more applications, activate other features or give access to new users.</p>
             <p>To setup your preferences (name, email signature, avatar), click on the top right corner.</p>]]></field>
         </record>
     </data>

From 7fb30862964cc426ecc6c1c15cd877289c939b74 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 15:19:42 +0530
Subject: [PATCH 21/32] [FIX]sale:string updated

bzr revid: kbh@tinyerp.com-20121219094942-6dkketgcdtxktvrl
---
 addons/sale/__openerp__.py             | 2 +-
 addons/sale/res_config.py              | 4 ++--
 addons/sale/sale.py                    | 2 +-
 addons/sale/sale_view.xml              | 6 +++---
 addons/sale/security/sale_security.xml | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/sale/__openerp__.py b/addons/sale/__openerp__.py
index 218f844c0e1..8cc4919e3a1 100644
--- a/addons/sale/__openerp__.py
+++ b/addons/sale/__openerp__.py
@@ -24,7 +24,7 @@
     'version': '1.0',
     'category': 'Sales Management',
     'sequence': 14,
-    'summary': 'Quotations, Sale Orders, Invoicing',
+    'summary': 'Quotations, Sales Orders, Invoicing',
     'description': """
 Manage sales quotations and orders
 ==================================
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 52f38a23486..72ae3db02ea 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -69,7 +69,7 @@ Example: Product: this product is deprecated, do not purchase more than 5.
                 But the possibility to change these values is still available.
                 This installs the module analytic_user_function."""),
         'module_project': fields.boolean("Project"),
-        'module_sale_stock': fields.boolean("Trigger delivery orders automatically from sale orders",
+        'module_sale_stock': fields.boolean("Trigger delivery orders automatically from sales orders",
             help="""Allows you to Make Quotation, Sale Order using different Order policy and Manage Related Stock.
                     This installs the module sale_stock."""),
     }
@@ -126,7 +126,7 @@ class account_config_settings(osv.osv_memory):
             help="""This allows install module sale_analytic_plans."""),
         'group_analytic_account_for_sales': fields.boolean('Analytic accounting for sales',
             implied_group='sale.group_analytic_accounting',
-            help="Allows you to specify an analytic account on sale orders."),
+            help="Allows you to specify an analytic account on sales orders."),
     }
 
     def onchange_sale_analytic_plans(self, cr, uid, ids, module_sale_analytic_plans, context=None):
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index cf68ee01672..ca2f7dba69a 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -183,7 +183,7 @@ class sale_order(osv.osv):
             ('sent', 'Quotation Sent'),
             ('cancel', 'Cancelled'),
             ('waiting_date', 'Waiting Schedule'),
-            ('progress', 'Sale Order'),
+            ('progress', 'Sales Orders'),
             ('manual', 'Sale to Invoice'),
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 2c2fdd6991f..037e49fb419 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -307,7 +307,7 @@
                     <filter icon="terp-dolar_ok!" string="To Invoice" domain="[('state','=','manual')]" help="Sales Order ready to be invoiced"/>
                     <filter icon="terp-dolar_ok!" string="Done" domain="[('state','=','done')]" help="Sales Order done"/>
                     <separator/>
-                    <filter string="My Sale Orders" domain="[('user_id','=',uid)]" help="My Sale Orders" icon="terp-personal" name="my_sale_orders_filter"/>
+                    <filter string="My Sales Orders" domain="[('user_id','=',uid)]" help="My Sales Orders" icon="terp-personal" name="my_sale_orders_filter"/>
                     <field name="partner_id"/>
                     <field name="user_id"/>
                     <field name="project_id"/>
@@ -322,7 +322,7 @@
         </record>
 
         <record id="action_orders" model="ir.actions.act_window">
-            <field name="name">Sale Orders</field>
+            <field name="name">Sales Orders</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">sale.order</field>
             <field name="view_type">form</field>
@@ -336,7 +336,7 @@
                 order.
               </p><p>
                 OpenERP will help you efficiently handle the complete sales flow:
-                quotation, sale order, delivery, invoicing and payment.
+                quotation, sales orders, delivery, invoicing and payment.
               </p>
             </field>
         </record>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index bf38d31b156..ff684d42d95 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -30,7 +30,7 @@
     </record>
 
     <record id="group_delivery_invoice_address" model="res.groups">
-        <field name="name">Addresses in Sale Orders</field>
+        <field name="name">Addresses in Sales Orders</field>
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 

From f81ff1851503fb99375ac9633dfc3e77b5a93d6c Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 15:25:00 +0530
Subject: [PATCH 22/32] [FIX]mail:string updated

bzr revid: kbh@tinyerp.com-20121219095500-iqwxgco0kdys68s6
---
 addons/mail/static/src/xml/mail.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index 3c510813029..1c848be6960 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -214,7 +214,7 @@
                 <div class='oe_msg_icons' t-if="!widget.options.readonly">
                     <span class='oe_read' t-if="widget.options.show_read"><a title="Done" class="oe_e">W</a></span>
                     <span class='oe_unread' t-if="widget.is_favorite and widget.options.show_unread"><a title="Set back to Todo" class="oe_e">v</a></span>
-                    <span class='oe_unread' t-if="!widget.is_favorite and widget.options.show_unread"><a title="Set back to Inbox" class="oe_e">v</a></span>
+                    <span class='oe_unread' t-if="!widget.is_favorite and widget.options.show_unread"><a title="Move to Inbox" class="oe_e">v</a></span>
                     <span class='oe_reply' t-if="widget.options.show_reply_button"><a title="Reply" class="oe_e">(</a></span>
                     <span t-attf-class="oe_star #{widget.is_favorite?'oe_starred':''}"><a title="Mark as Todo" class="oe_e">7</a></span>
                 </div>

From a728e82a185f4c33d20e37e00fa6941477803269 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 19 Dec 2012 15:26:16 +0530
Subject: [PATCH 23/32] [IMP] Account : changes done

bzr revid: rpr@tinyerp.com-20121219095616-nst6mvfh2ky3i10s
---
 addons/account/account.py            |  6 +++---
 addons/account/account_view.xml      | 14 +++++++-------
 addons/account/data/account_data.xml |  2 +-
 addons/account/demo/account_demo.xml |  2 +-
 addons/account/partner.py            |  4 ++--
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index fe52decd9f3..469c5b1d838 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -56,7 +56,7 @@ def check_cycle(self, cr, uid, ids, context=None):
 
 class account_payment_term(osv.osv):
     _name = "account.payment.term"
-    _description = "Payment Terms"
+    _description = "Payment Term"
     _columns = {
         'name': fields.char('Payment Terms', size=64, translate=True, required=True),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the payment term without removing it."),
@@ -101,7 +101,7 @@ class account_payment_term(osv.osv):
 
 class account_payment_term_line(osv.osv):
     _name = "account.payment.term.line"
-    _description = "Payment Terms Line"
+    _description = "Payment Term Line"
     _columns = {
         'value': fields.selection([('procent', 'Percent'),
                                    ('balance', 'Balance'),
@@ -128,7 +128,7 @@ class account_payment_term_line(osv.osv):
         return True
 
     _constraints = [
-        (_check_percent, 'Percentages for Payment Terms Line must be between 0 and 1, Example: 0.02 for 2%.', ['value_amount']),
+        (_check_percent, 'Percentages for Payment Term Line must be between 0 and 1, Example: 0.02 for 2%.', ['value_amount']),
     ]
 
 account_payment_term_line()
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index a50b1d4e432..dd58ce4aa69 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1548,7 +1548,7 @@
             <field name="name">account.payment.term.line.tree</field>
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
-                <tree string="Payment Terms">
+                <tree string="Payment Term">
                     <field name="value"/>
                     <field name="value_amount" attrs="{'readonly':[('value','=','balance')]}"/>
                     <field name="days"/>
@@ -1560,7 +1560,7 @@
             <field name="name">account.payment.term.line.form</field>
             <field name="model">account.payment.term.line</field>
             <field name="arch" type="xml">
-                <form string="Payment Terms" version="7.0">
+                <form string="Payment Term" version="7.0">
                     <group>
                         <group string="Amount Computation">
 	                        <field name="value"/>
@@ -1582,7 +1582,7 @@
             <field name="name">account.payment.term.search</field>
             <field name="model">account.payment.term</field>
             <field name="arch" type="xml">
-                <search string="Payment Terms">
+                <search string="Payment Term">
                     <field name="name" string="Payment Terms"/>
                     <field name="active"/>
                 </search>
@@ -1592,7 +1592,7 @@
             <field name="name">account.payment.term.form</field>
             <field name="model">account.payment.term</field>
             <field name="arch" type="xml">
-                <form string="Payment Terms" version="7.0">
+                <form string="Payment Term" version="7.0">
                     <group col="4">
                         <field name="name"/>
                         <field name="active"/>
@@ -2296,17 +2296,17 @@
                                     <tree string="Opening Cashbox Lines" editable="bottom">
                                         <field name="pieces"/>
                                         <field name="number_opening" string="Opening Unit Numbers" on_change="on_change_sub_opening(pieces, number_opening, parent.balance_end)"/>
-                                        <field name="subtotal_opening" string="Opening Amount"/>
+                                        <field name="subtotal_opening" string="Opening Subtotal"/>
                                     </tree>
                                 </field>
                                 <field name="closing_details_ids" nolabel="1" colspan="4" attrs="{'invisible' : [('state', '=', 'draft')]}">
                                     <tree string="Closing Cashbox Lines" editable="bottom">
                                         <field name="pieces" readonly="1" />
                                         <field name="number_opening" string="Opening Unit Numbers" readonly="1" />
-                                        <field name="subtotal_opening" string="Opening Amount" readonly="1" />
+                                        <field name="subtotal_opening" string="Opening Subtotal" readonly="1" />
 
                                         <field name="number_closing" string="Closing Unit Numbers" on_change="on_change_sub_closing(pieces, number_closing, parent.balance_end)"/>
-                                        <field name="subtotal_closing" string="Closing Amount"/>
+                                        <field name="subtotal_closing" string="Closing Subtotal"/>
                                     </tree>
                                 </field>
                             </group>
diff --git a/addons/account/data/account_data.xml b/addons/account/data/account_data.xml
index 24b4325020e..f8a0fcdfcaa 100644
--- a/addons/account/data/account_data.xml
+++ b/addons/account/data/account_data.xml
@@ -38,7 +38,7 @@
         </record>
 
         <record forcecreate="True" id="decimal_payment" model="decimal.precision">
-            <field name="name">Payment Terms</field>
+            <field name="name">Payment Term</field>
             <field name="digits">6</field>
         </record>
 
diff --git a/addons/account/demo/account_demo.xml b/addons/account/demo/account_demo.xml
index 9ee821aab0f..6918ad44702 100644
--- a/addons/account/demo/account_demo.xml
+++ b/addons/account/demo/account_demo.xml
@@ -128,7 +128,7 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
         
-        <!-- Payment Terms -->
+        <!-- Payment Term -->
         
         <record id="account_payment_term" model="account.payment.term">
             <field name="name">30 Days End of Month</field>
diff --git a/addons/account/partner.py b/addons/account/partner.py
index c2a8bcfc241..346cc38f5df 100644
--- a/addons/account/partner.py
+++ b/addons/account/partner.py
@@ -221,14 +221,14 @@ class res_partner(osv.osv):
             'account.payment.term',
             type='many2one',
             relation='account.payment.term',
-            string ='Customer Payment Terms',
+            string ='Customer Payment Term',
             view_load=True,
             help="This payment term will be used instead of the default one for sale orders and customer invoices"),
         'property_supplier_payment_term': fields.property(
             'account.payment.term',
              type='many2one',
              relation='account.payment.term',
-             string ='Supplier Payment Terms',
+             string ='Supplier Payment Term',
              view_load=True,
              help="This payment term will be used instead of the default one for purchase orders and supplier invoices"),
         'ref_companies': fields.one2many('res.company', 'partner_id',

From 6b2c3ab2d6c17168f5006edad1eef4bf9bc81a10 Mon Sep 17 00:00:00 2001
From: "Randhir Mayatra (OpenERP)" <rma@tinyerp.com>
Date: Wed, 19 Dec 2012 16:01:57 +0530
Subject: [PATCH 24/32] [IMP] make chnages into string.

bzr revid: rma@tinyerp.com-20121219103157-78usxdfwkovo8kaf
---
 addons/hr_holidays/hr_holidays_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/hr_holidays/hr_holidays_view.xml b/addons/hr_holidays/hr_holidays_view.xml
index 79e11a25ffb..24b37f617bd 100644
--- a/addons/hr_holidays/hr_holidays_view.xml
+++ b/addons/hr_holidays/hr_holidays_view.xml
@@ -442,8 +442,8 @@
             <field name="search_view_id" ref="view_hr_holidays_status_search"/>
         </record>
 
-        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Leaves"/>
         <menuitem name="Time Off Categories" action="open_view_holiday_status" id="menu_open_view_holiday_status" parent="hr.menu_hr_configuration" sequence="10"/>
+        <menuitem sequence="3" id="hr.menu_open_view_attendance_reason_config" parent="hr.menu_hr_configuration" name="Time off"/>
 
         <!-- Holiday on resource leave -->
         <record id="resource_calendar_leave_form_inherit" model="ir.ui.view">

From 4891c7fabf64df044c343c8040c3af1afee4ab68 Mon Sep 17 00:00:00 2001
From: "Rajesh Prajapati (OpenERP)" <rpr@tinyerp.com>
Date: Wed, 19 Dec 2012 16:27:58 +0530
Subject: [PATCH 25/32] [IMP] Account : changes removed

bzr revid: rpr@tinyerp.com-20121219105758-6r4pkmf8buq4dht9
---
 addons/account/account.py                       | 4 ++--
 addons/account/account_view.xml                 | 2 +-
 addons/account/report/account_invoice_report.py | 2 +-
 addons/account/report/account_report.py         | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/addons/account/account.py b/addons/account/account.py
index 469c5b1d838..a724ebc3cc7 100644
--- a/addons/account/account.py
+++ b/addons/account/account.py
@@ -58,7 +58,7 @@ class account_payment_term(osv.osv):
     _name = "account.payment.term"
     _description = "Payment Term"
     _columns = {
-        'name': fields.char('Payment Terms', size=64, translate=True, required=True),
+        'name': fields.char('Payment Term', size=64, translate=True, required=True),
         'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the payment term without removing it."),
         'note': fields.text('Description', translate=True),
         'line_ids': fields.one2many('account.payment.term.line', 'payment_id', 'Terms'),
@@ -112,7 +112,7 @@ class account_payment_term_line(osv.osv):
         'days': fields.integer('Number of Days', required=True, help="Number of days to add before computation of the day of month." \
             "If Date=15/01, Number of Days=22, Day of Month=-1, then the due date is 28/02."),
         'days2': fields.integer('Day of the Month', required=True, help="Day of the month, set -1 for the last day of the current month. If it's positive, it gives the day of the next month. Set 0 for net days (otherwise it's based on the beginning of the month)."),
-        'payment_id': fields.many2one('account.payment.term', 'Payment Terms', required=True, select=True, ondelete='cascade'),
+        'payment_id': fields.many2one('account.payment.term', 'Payment Term', required=True, select=True, ondelete='cascade'),
     }
     _defaults = {
         'value': 'balance',
diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index dd58ce4aa69..adf7ac05067 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1583,7 +1583,7 @@
             <field name="model">account.payment.term</field>
             <field name="arch" type="xml">
                 <search string="Payment Term">
-                    <field name="name" string="Payment Terms"/>
+                    <field name="name" string="Payment Term"/>
                     <field name="active"/>
                 </search>
             </field>
diff --git a/addons/account/report/account_invoice_report.py b/addons/account/report/account_invoice_report.py
index d98fc336e70..af6ae1eede7 100644
--- a/addons/account/report/account_invoice_report.py
+++ b/addons/account/report/account_invoice_report.py
@@ -63,7 +63,7 @@ class account_invoice_report(osv.osv):
         'product_id': fields.many2one('product.product', 'Product', readonly=True),
         'product_qty':fields.float('Qty', readonly=True),
         'uom_name': fields.char('Reference Unit of Measure', size=128, readonly=True),
-        'payment_term': fields.many2one('account.payment.term', 'Payment Terms', readonly=True),
+        'payment_term': fields.many2one('account.payment.term', 'Payment Term', readonly=True),
         'period_id': fields.many2one('account.period', 'Force Period', domain=[('state','<>','done')], readonly=True),
         'fiscal_position': fields.many2one('account.fiscal.position', 'Fiscal Position', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
diff --git a/addons/account/report/account_report.py b/addons/account/report/account_report.py
index f3a974f09ea..d6cc784c767 100644
--- a/addons/account/report/account_report.py
+++ b/addons/account/report/account_report.py
@@ -164,7 +164,7 @@ class report_invoice_created(osv.osv):
             ],'Type', readonly=True),
         'number': fields.char('Invoice Number', size=32, readonly=True),
         'partner_id': fields.many2one('res.partner', 'Partner', readonly=True),
-        'amount_untaxed': fields.float('Subtotal', readonly=True),
+        'amount_untaxed': fields.float('Untaxed', readonly=True),
         'amount_total': fields.float('Total', readonly=True),
         'currency_id': fields.many2one('res.currency', 'Currency', readonly=True),
         'date_invoice': fields.date('Invoice Date', readonly=True),

From f38bdac36aa353ccd07f60fcf59208e306406074 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 18:51:55 +0530
Subject: [PATCH 26/32] [FIX]account:field string

bzr revid: kbh@tinyerp.com-20121219132155-0dxl1cgpb2jhn4jf
---
 addons/account/account_bank_statement.py                        | 2 +-
 .../account_bank_statement_extensions/account_bank_statement.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index d1e25029f4f..d61dd679393 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -547,7 +547,7 @@ class account_bank_statement_line(osv.osv):
     _name = "account.bank.statement.line"
     _description = "Bank Statement Line"
     _columns = {
-        'name': fields.char('Communication', required=True),
+        'name': fields.char('OBI', required=True, Help="Originator to Beneficiary Information"),
         'date': fields.date('Date', required=True),
         'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
         'type': fields.selection([
diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index ee2988bab6f..19b2f9cc248 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -63,7 +63,7 @@ class account_bank_statement_line_global(osv.osv):
     _description = 'Batch Payment Info'
 
     _columns = {
-        'name': fields.char('Communication', size=128, required=True),
+        'name': fields.char('OBI', size=128, required=True, Help="Originator to Beneficiary Information"),
         'code': fields.char('Code', size=64, required=True),
         'parent_id': fields.many2one('account.bank.statement.line.global', 'Parent Code', ondelete='cascade'),
         'child_ids': fields.one2many('account.bank.statement.line.global', 'parent_id', 'Child Codes'),

From 143cba7f3241bd088a1b904db5ac28de4d69bf67 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Wed, 19 Dec 2012 18:52:53 +0530
Subject: [PATCH 27/32] [FIX]crm:field string

bzr revid: kbh@tinyerp.com-20121219132253-dx4ceiw78ptgzvjc
---
 addons/crm/crm_data.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/crm/crm_data.xml b/addons/crm/crm_data.xml
index 282622d2ad2..3726c744b2e 100644
--- a/addons/crm/crm_data.xml
+++ b/addons/crm/crm_data.xml
@@ -39,7 +39,7 @@
         </record>
 
         <record model="crm.payment.mode" id="payment_mode_2">
-            <field name="name">Cheque</field>
+            <field name="name">Check</field>
             <field name="section_id" ref="crm.section_sales_department"/>
         </record>
 

From 527bf5dbb964d9301682d5ea6cbd6fa0b3dab448 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 20 Dec 2012 17:01:43 +0530
Subject: [PATCH 28/32] [FIX]account_voucher:help updated

bzr revid: kbh@tinyerp.com-20121220113143-v3c9tta3ox6gqr2z
---
 addons/account_voucher/voucher_payment_receipt_view.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/addons/account_voucher/voucher_payment_receipt_view.xml b/addons/account_voucher/voucher_payment_receipt_view.xml
index 38b1425af92..884e04f09d7 100644
--- a/addons/account_voucher/voucher_payment_receipt_view.xml
+++ b/addons/account_voucher/voucher_payment_receipt_view.xml
@@ -262,8 +262,7 @@
               <p class="oe_view_nocontent_create">
                 Click to create a new supplier payment.
               </p><p>
-                OpenERP helps you easily track payments you do and remining
-                balance to pay to your supplier.
+                OpenERP helps you easily track payments you make and the remaining balances you need to pay your suppliers.
               </p>
             </field>
         </record>

From ac4442df609f2c2111bb1a3bf732a5c418f409ee Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 20 Dec 2012 17:13:56 +0530
Subject: [PATCH 29/32] [FIX]sale:help updated

bzr revid: kbh@tinyerp.com-20121220114356-q7w7oodmv83no6n9
---
 addons/sale/res_partner_view.xml |  8 ++++----
 addons/sale/sale.py              |  2 +-
 addons/sale/sale_view.xml        | 10 +++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/addons/sale/res_partner_view.xml b/addons/sale/res_partner_view.xml
index 58d337350ba..54a9813eea9 100644
--- a/addons/sale/res_partner_view.xml
+++ b/addons/sale/res_partner_view.xml
@@ -10,15 +10,15 @@
             <field name="groups_id" eval="[(4, ref('base.group_sale_salesman'))]"/>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to create a quotation or sale order for this customer.
+                Click to create a quotation or sales order for this customer.
               </p><p>
                 OpenERP will help you efficiently handle the complete sale flow:
-                quotation, sale order, delivery, invoicing and
+                quotation, sales order, delivery, invoicing and
                 payment.
               </p><p>
-                The social feature helps you organize discussions on each sale
+                The social feature helps you organize discussions on each sales
                 order, and allow your customer to keep track of the evolution
-                of the sale order.
+                of the sales order.
               </p>
             </field>
         </record>
diff --git a/addons/sale/sale.py b/addons/sale/sale.py
index ca2f7dba69a..84cef841621 100644
--- a/addons/sale/sale.py
+++ b/addons/sale/sale.py
@@ -183,7 +183,7 @@ class sale_order(osv.osv):
             ('sent', 'Quotation Sent'),
             ('cancel', 'Cancelled'),
             ('waiting_date', 'Waiting Schedule'),
-            ('progress', 'Sales Orders'),
+            ('progress', 'Sales Order'),
             ('manual', 'Sale to Invoice'),
             ('invoice_except', 'Invoice Exception'),
             ('done', 'Done'),
diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index 037e49fb419..cbf55b81504 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -332,11 +332,11 @@
             <field name="domain">[('state','not in',('draft','sent','cancel'))]</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                Click to create a quotation that can be converted into a sale
+                Click to create a quotation that can be converted into a sales
                 order.
               </p><p>
                 OpenERP will help you efficiently handle the complete sales flow:
-                quotation, sales orders, delivery, invoicing and payment.
+                quotation, sales order, delivery, invoicing and payment.
               </p>
             </field>
         </record>
@@ -379,12 +379,12 @@
                 Click to create a quotation, the first step of a new sale.
               </p><p>
                 OpenERP will help you handle efficiently the complete sale flow:
-                from the quotation to the sale order, the
+                from the quotation to the sales order, the
                 delivery, the invoicing and the payment collection.
               </p><p>
-                The social feature helps you organize discussions on each sale
+                The social feature helps you organize discussions on each sales
                 order, and allow your customers to keep track of the evolution
-                of the sale order.
+                of the sales order.
               </p>
             </field>
         </record>

From d576e03181a00afd9418e1ed1dca03627a877e2f Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 20 Dec 2012 17:24:56 +0530
Subject: [PATCH 30/32] [FIX]account:help updated

bzr revid: kbh@tinyerp.com-20121220115456-4v35ga282ewkm7t7
---
 addons/account/account_bank_statement.py                        | 2 +-
 .../account_bank_statement_extensions/account_bank_statement.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/addons/account/account_bank_statement.py b/addons/account/account_bank_statement.py
index d61dd679393..8e1a5dd26c6 100644
--- a/addons/account/account_bank_statement.py
+++ b/addons/account/account_bank_statement.py
@@ -547,7 +547,7 @@ class account_bank_statement_line(osv.osv):
     _name = "account.bank.statement.line"
     _description = "Bank Statement Line"
     _columns = {
-        'name': fields.char('OBI', required=True, Help="Originator to Beneficiary Information"),
+        'name': fields.char('OBI', required=True, help="Originator to Beneficiary Information"),
         'date': fields.date('Date', required=True),
         'amount': fields.float('Amount', digits_compute=dp.get_precision('Account')),
         'type': fields.selection([
diff --git a/addons/account_bank_statement_extensions/account_bank_statement.py b/addons/account_bank_statement_extensions/account_bank_statement.py
index 19b2f9cc248..60dcc6dfa25 100644
--- a/addons/account_bank_statement_extensions/account_bank_statement.py
+++ b/addons/account_bank_statement_extensions/account_bank_statement.py
@@ -63,7 +63,7 @@ class account_bank_statement_line_global(osv.osv):
     _description = 'Batch Payment Info'
 
     _columns = {
-        'name': fields.char('OBI', size=128, required=True, Help="Originator to Beneficiary Information"),
+        'name': fields.char('OBI', size=128, required=True, help="Originator to Beneficiary Information"),
         'code': fields.char('Code', size=64, required=True),
         'parent_id': fields.many2one('account.bank.statement.line.global', 'Parent Code', ondelete='cascade'),
         'child_ids': fields.one2many('account.bank.statement.line.global', 'parent_id', 'Child Codes'),

From a9cb75a811e93511a0057ab7c55b3ca06667f80e Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 20 Dec 2012 18:13:46 +0530
Subject: [PATCH 31/32] [FIX]sale:string updated

bzr revid: kbh@tinyerp.com-20121220124346-2wp20yd7fe2dz12g
---
 addons/sale/sale_view.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale/sale_view.xml b/addons/sale/sale_view.xml
index cbf55b81504..5c3e9b214cc 100644
--- a/addons/sale/sale_view.xml
+++ b/addons/sale/sale_view.xml
@@ -148,7 +148,7 @@
                 <sheet>
                     <h1>
                         <label string="Quotation " attrs="{'invisible': [('state','not in',('draft','sent'))]}"/>
-                        <label string="Sale Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
+                        <label string="Sales Order " attrs="{'invisible': [('state','in',('draft','sent'))]}"/>
                         <field name="name" class="oe_inline" readonly="1"/>
                     </h1>
                     <group>

From 9cb43097a1aa5be1539c03d46487e1df71996652 Mon Sep 17 00:00:00 2001
From: "Khushboo Bhatt (Open ERP)" <kbh@tinyerp.com>
Date: Thu, 20 Dec 2012 18:26:54 +0530
Subject: [PATCH 32/32] [FIX]sale_stock:string updated

bzr revid: kbh@tinyerp.com-20121220125654-7opo99b8mn9y1dgt
---
 addons/sale_stock/sale_stock.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/addons/sale_stock/sale_stock.py b/addons/sale_stock/sale_stock.py
index 21bf13a1cdc..20e874a8ca2 100644
--- a/addons/sale_stock/sale_stock.py
+++ b/addons/sale_stock/sale_stock.py
@@ -118,7 +118,7 @@ class sale_order(osv.osv):
             ('sent', 'Quotation Sent'),
             ('cancel', 'Cancelled'),
             ('waiting_date', 'Waiting Schedule'),
-            ('progress', 'Sale Order'),
+            ('progress', 'Sales Order'),
             ('manual', 'Sale to Invoice'),
             ('shipping_except', 'Shipping Exception'),
             ('invoice_except', 'Invoice Exception'),