From 36c05660eec79f738cb7a20eddff600672907c9d Mon Sep 17 00:00:00 2001
From: Martin Trigaux <mat@odoo.com>
Date: Thu, 5 Nov 2015 09:14:00 +0100
Subject: [PATCH] [FIX] morning typo fix

---
 addons/crm/web_planner_data.xml                       | 2 +-
 addons/mail/views/contact_views.xml                   | 2 +-
 addons/pos_restaurant/restaurant_view.xml             | 2 +-
 addons/web_planner/views/web_planner_views.xml        | 2 +-
 addons/website_links/views/website_links_template.xml | 2 +-
 openerp/addons/base/res/res_partner_view.xml          | 2 +-
 openerp/addons/base/res/res_users.py                  | 4 ++--
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/addons/crm/web_planner_data.xml b/addons/crm/web_planner_data.xml
index 99d9ead21e2..6b156af83a4 100644
--- a/addons/crm/web_planner_data.xml
+++ b/addons/crm/web_planner_data.xml
@@ -87,7 +87,7 @@
                 <t t-call="web_planner.page">
                     <t t-set="page_title">Your KPIs</t>
                     <p class="text-muted">
-                        What are the main KPIs you need to track for your the sales actities?
+                        What are the main KPIs you need to track for your the sales activities?
                     </p>
                     <div class="row">
                         <div class="o_planner_notebook_container col-md-12">
diff --git a/addons/mail/views/contact_views.xml b/addons/mail/views/contact_views.xml
index 06f9ad6fc82..4dd40e0ef73 100644
--- a/addons/mail/views/contact_views.xml
+++ b/addons/mail/views/contact_views.xml
@@ -15,7 +15,7 @@
             Click to add a contact in your address book.
           </p><p>
            Odoo helps you easily track all activities related to
-            a customer; discussions, history of business opportunities,
+            a customer: discussions, history of business opportunities,
             documents, etc.
           </p>
         </field>
diff --git a/addons/pos_restaurant/restaurant_view.xml b/addons/pos_restaurant/restaurant_view.xml
index 27f323651b7..2c05b63f248 100644
--- a/addons/pos_restaurant/restaurant_view.xml
+++ b/addons/pos_restaurant/restaurant_view.xml
@@ -131,7 +131,7 @@
               </p><p>
                 Each Order Printer has an IP Address that defines the PosBox/Hardware
                 Proxy where the printer can be found, and a list of product categories.
-                An Order Printer will only print updates for prodcuts belonging to one of
+                An Order Printer will only print updates for products belonging to one of
                 its categories.
               </p>
             </field>
diff --git a/addons/web_planner/views/web_planner_views.xml b/addons/web_planner/views/web_planner_views.xml
index c1f3f796dae..3b4efc028a9 100644
--- a/addons/web_planner/views/web_planner_views.xml
+++ b/addons/web_planner/views/web_planner_views.xml
@@ -21,7 +21,7 @@
         <field name="arch" type="xml">
             <search string="Planner">
                 <filter name="active" string="Active" domain="[('active', '=', True)]"/>
-                <filter name="unactive" string="Unactive" domain="[('active', '=', False)]"/>
+                <filter name="unactive" string="Inactive" domain="[('active', '=', False)]"/>
             </search>
         </field>
     </record>
diff --git a/addons/website_links/views/website_links_template.xml b/addons/website_links/views/website_links_template.xml
index 7b0753de7bd..0a200ff75c5 100644
--- a/addons/website_links/views/website_links_template.xml
+++ b/addons/website_links/views/website_links_template.xml
@@ -83,7 +83,7 @@
 
                         <div class="col-sm-offset-1 col-sm-3 hidden-xs">
                             <p class="text-muted text-justify">Share this page with a <strong>short link</strong> that includes <strong>analytics trackers</strong>.</p>
-                            <p class="text-muted text-justify">Thoses trackers can be used in Google Analytics to track clicks and visitors, or in Odoo reports to track opportunities and related revenues.</p>
+                            <p class="text-muted text-justify">Those trackers can be used in Google Analytics to track clicks and visitors, or in Odoo reports to track opportunities and related revenues.</p>
                         </div>
                     </div>
          
diff --git a/openerp/addons/base/res/res_partner_view.xml b/openerp/addons/base/res/res_partner_view.xml
index 7adfd7619ec..5b7ee1695cd 100644
--- a/openerp/addons/base/res/res_partner_view.xml
+++ b/openerp/addons/base/res/res_partner_view.xml
@@ -441,7 +441,7 @@
                 Click to add a contact in your address book.
               </p><p>
                 Odoo helps you easily track all activities related to
-                a customer; discussions, history of business opportunities,
+                a customer: discussions, history of business opportunities,
                 documents, etc.
               </p>
             </field>
diff --git a/openerp/addons/base/res/res_users.py b/openerp/addons/base/res/res_users.py
index 60b19502fd0..db1c6c09a48 100644
--- a/openerp/addons/base/res/res_users.py
+++ b/openerp/addons/base/res/res_users.py
@@ -346,9 +346,9 @@ class res_users(osv.osv):
         if values.get('active') == False:
             for current_id in ids:
                 if current_id == SUPERUSER_ID:
-                    raise UserError(_("You cannot unactivate the admin user."))
+                    raise UserError(_("You cannot deactivate the admin user."))
                 elif current_id == uid:
-                    raise UserError(_("You cannot unactivate the user you're currently logged in as."))
+                    raise UserError(_("You cannot deactivate the user you're currently logged in as."))
 
         if ids == [uid]:
             for key in values.keys():