From 07448cfe99d11b4dd76056ea8228fbd25723be09 Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Fri, 30 Oct 2015 16:22:40 +0100
Subject: [PATCH] [FIX] English terms

---
 addons/mail/models/mail_shortcode.py      | 2 +-
 addons/stock/data/web_planner_data.xml    | 2 +-
 openerp/addons/base/ir/ir_rule.py         | 2 +-
 openerp/addons/base/res/res_lang_view.xml | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/addons/mail/models/mail_shortcode.py b/addons/mail/models/mail_shortcode.py
index a28bd0df552..478fb7be2ef 100644
--- a/addons/mail/models/mail_shortcode.py
+++ b/addons/mail/models/mail_shortcode.py
@@ -16,7 +16,7 @@ class MailShortcode(models.Model):
     _description = 'Canned Response / Shortcode'
 
     source = fields.Char('Shortcut', required=True, index=True, help="The shortcut which must be replace in the Chat Messages")
-    substitution = fields.Char('Substitution', required=True, index=True, help="The excaped html code replacing the shortcut")
+    substitution = fields.Char('Substitution', required=True, index=True, help="The escaped html code replacing the shortcut")
     description = fields.Char('Description')
     shortcode_type = fields.Selection([('image', 'Smiley'), ('text', 'Canned Response')], required=True, default='text',
         help="* Smiley are only used for HTML code to display an image "\
diff --git a/addons/stock/data/web_planner_data.xml b/addons/stock/data/web_planner_data.xml
index 8510281bef3..1d21e60895f 100644
--- a/addons/stock/data/web_planner_data.xml
+++ b/addons/stock/data/web_planner_data.xml
@@ -440,7 +440,7 @@
                         <li>Define routes within your warehouse according to business needs, such as Quality Control, After Sales Services or Supplier Returns</li>
                         <li>Help rental management, by generating automated return moves for rented products</li>
                     </ul>
-                    <p>This is quite complex to set up, so <strong>contact your Projet Manager</strong> and he will take care of this for you</p>
+                    <p>This is quite complex to set up, so <strong>contact your Project Manager</strong> to address this</p>
                 </t>
             </t>
             <t t-call="web_planner.page">
diff --git a/openerp/addons/base/ir/ir_rule.py b/openerp/addons/base/ir/ir_rule.py
index fbb6e250d56..900462e97ad 100644
--- a/openerp/addons/base/ir/ir_rule.py
+++ b/openerp/addons/base/ir/ir_rule.py
@@ -55,7 +55,7 @@ class ir_rule(osv.osv):
 
     _columns = {
         'name': fields.char('Name', select=1),
-        'active': fields.boolean('Active', help="If you uncheck the active field, it will disable the record rule without deleting it (if you delete a native record rule, it may be re-created when you reload the module."),
+        'active': fields.boolean('Active', help="If you uncheck the active field, it will disable the record rule without deleting it (if you delete a native record rule, it may be re-created when you reload the module)."),
         'model_id': fields.many2one('ir.model', 'Object',select=1, required=True, ondelete="cascade"),
         'global': fields.function(_get_value, string='Global', type='boolean', store=True, help="If no group is specified the rule is global and applied to everyone"),
         'groups': fields.many2many('res.groups', 'rule_group_rel', 'rule_group_id', 'group_id', 'Groups'),
diff --git a/openerp/addons/base/res/res_lang_view.xml b/openerp/addons/base/res/res_lang_view.xml
index 4c2a203ac13..c1001b997d5 100644
--- a/openerp/addons/base/res/res_lang_view.xml
+++ b/openerp/addons/base/res/res_lang_view.xml
@@ -13,7 +13,7 @@
                     <field name="translatable"/>
                     <field name="active"/>
                     <button name="%(base.action_wizard_update_translations)d"
-                    string="Update Terms" type="action" icon="gtk-ok" help="Update Languague Terms"/>
+                    string="Update Terms" type="action" icon="gtk-ok" help="Update Language Terms"/>
                 </tree>
             </field>
         </record>