[FIX] *: various English errors

Unclear or incorrect sentenses.
Courtesy of Eric Geens

8 files changed, 15 insertions, 14 deletions

diff --git a/addons/lunch/views/lunch_views.xml b/addons/lunch/views/lunch_views.xml
index 60ea66e0c35..42a4012fdc0 100644
--- a/addons/lunch/views/lunch_views.xml
+++ b/addons/lunch/views/lunch_views.xml
@@ -204,7 +204,7 @@
             <field name="context">{"search_default_group_by_date":1, "search_default_group_by_supplier":1}</field>
             <field name="help" type="html">
               <p>
-                Here you can see every orders grouped by vendors and by date.
+                Summary of all lunch orders, grouped by vendor and by date.
               </p>
               <p>
                 - Click on the <img src="../../../web/static/src/img/icons/terp-call-start.png"/> to announce that the order is ordered <br/>
@@ -281,7 +281,7 @@
                 Click to create a lunch category.
             </p>
               <p>
-                Here you can find every lunch categories for products.
+                Here you can access all categories for the lunch products.
               </p>
             </field>
         </record>
diff --git a/addons/payment_buckaroo/models/buckaroo.py b/addons/payment_buckaroo/models/buckaroo.py
index 054dd749e98..59d9e05f902 100644
--- a/addons/payment_buckaroo/models/buckaroo.py
+++ b/addons/payment_buckaroo/models/buckaroo.py
@@ -119,7 +119,7 @@ class TxBuckaroo(osv.Model):
         transaction record. """
         reference, pay_id, shasign = data.get('BRQ_INVOICENUMBER'), data.get('BRQ_PAYMENT'), data.get('BRQ_SIGNATURE')
         if not reference or not pay_id or not shasign:
-            error_msg = _('Buckaroo: received data with missing reference (%s) or pay_id (%s) or shashign (%s)') % (reference, pay_id, shasign)
+            error_msg = _('Buckaroo: received data with missing reference (%s) or pay_id (%s) or shasign (%s)') % (reference, pay_id, shasign)
             _logger.info(error_msg)
             raise ValidationError(error_msg)
 
diff --git a/addons/payment_ogone/models/ogone.py b/addons/payment_ogone/models/ogone.py
index b4466680493..045d89e80cd 100644
--- a/addons/payment_ogone/models/ogone.py
+++ b/addons/payment_ogone/models/ogone.py
@@ -225,7 +225,7 @@ class PaymentTxOgone(osv.Model):
         transaction record. Create a payment method if an alias is returned."""
         reference, pay_id, shasign, alias = data.get('orderID'), data.get('PAYID'), data.get('SHASIGN'), data.get('ALIAS')
         if not reference or not pay_id or not shasign:
-            error_msg = _('Ogone: received data with missing reference (%s) or pay_id (%s) or shashign (%s)') % (reference, pay_id, shasign)
+            error_msg = _('Ogone: received data with missing reference (%s) or pay_id (%s) or shasign (%s)') % (reference, pay_id, shasign)
             _logger.info(error_msg)
             raise ValidationError(error_msg)
 
diff --git a/addons/product/product.py b/addons/product/product.py
index 698c131546c..81461d8f1f2 100644
--- a/addons/product/product.py
+++ b/addons/product/product.py
@@ -506,7 +506,8 @@ class product_template(osv.osv):
         'description_sale': fields.text('Sale Description',translate=True,
             help="A description of the Product that you want to communicate to your customers. "
                  "This description will be copied to every Sale Order, Delivery Order and Customer Invoice/Refund"),
-        'type': fields.selection(_get_product_template_type_wrapper, 'Product Type', required=True, help="Consumable are product where you don't manage stock, a service is a non-material product provided by a company or an individual."),        
+        'type': fields.selection(_get_product_template_type_wrapper, 'Product Type', required=True,
+            help="A consumable is a product for which you don't manage stock, a service is a non-material product provided by a company or an individual."),
         'rental': fields.boolean('Can be Rent'),
         'categ_id': fields.many2one('product.category','Internal Category', required=True, change_default=True, domain="[('type','=','normal')]" ,help="Select category for the current product"),
         'price': fields.function(_product_template_price, fnct_inv=_set_product_template_price, type='float', string='Price', digits_compute=dp.get_precision('Product Price')),
@@ -562,7 +563,7 @@ class product_template(osv.osv):
             help="This is minimum quantity to purchase from Main Vendor."),
         'seller_id': fields.related('selected_seller_id','name', type='many2one', relation='res.partner', string='Main Vendor',
             help="Main vendor who has highest priority in vendor list."),
-        'seller_price': fields.related('selected_seller_id','price', type='float', string='Vendor Price', help="Purchase price from from Main Vendor."),
+        'seller_price': fields.related('selected_seller_id','price', type='float', string='Vendor Price', help="Purchase price from main vendor."),
 
         'active': fields.boolean('Active', help="If unchecked, it will allow you to hide the product without removing it."),
         'color': fields.integer('Color Index'),
diff --git a/addons/sale_crm/sale_crm_view.xml b/addons/sale_crm/sale_crm_view.xml
index 5f9c723e402..17a334252da 100644
--- a/addons/sale_crm/sale_crm_view.xml
+++ b/addons/sale_crm/sale_crm_view.xml
@@ -72,7 +72,7 @@
                     <field name="campaign_id" groups="base.group_no_one" />
                     <field name="medium_id" groups="base.group_no_one"/>
                     <field name="source_id" groups="base.group_no_one"/>
-                    <field name="opportunity_id" help="Log in the chatter from what opportunity the order comes" groups="base.group_no_one"/>
+                    <field name="opportunity_id" help="Log in the chatter from which opportunity the order originates" groups="base.group_no_one"/>
                 </xpath>
             </field>
         </record>
diff --git a/addons/website_slides/controllers/main.py b/addons/website_slides/controllers/main.py
index 3047b06678a..70f70d5c6b7 100644
--- a/addons/website_slides/controllers/main.py
+++ b/addons/website_slides/controllers/main.py
@@ -295,8 +295,8 @@ class website_slides(http.Controller):
         payload = request.httprequest.content_length
         # payload is total request content size so it's not exact size of file.
         # already add client validation this is for double check if client alter.
-        if (payload / 1024 / 1024 > 17):
-            return {'error': _('File is too big.')}
+        if (payload / 1024 / 1024 > 15):
+            return {'error': _('File is too big. File size cannot exceed 15MB')}
 
         values = dict((fname, post[fname]) for fname in [
             'name', 'url', 'tag_ids', 'slide_type', 'channel_id',
diff --git a/addons/website_slides/data/website_slides_demo.xml b/addons/website_slides/data/website_slides_demo.xml
index 881f51d51bc..123396db9b9 100644
--- a/addons/website_slides/data/website_slides_demo.xml
+++ b/addons/website_slides/data/website_slides_demo.xml
@@ -42,7 +42,7 @@
             <field name="tag_ids" eval="[(4, ref('tag2'))]"/>
         </record>
         <record id="slide_1" model="slide.slide">
-            <field name="name">Open Source Website Builder and eCommerce: OpenERP</field>
+            <field name="name">Open Source Website Builder and eCommerce: Odoo</field>
             <field name="url">https://www.youtube.com/watch?v=pp7OCqWoRjQ</field>
             <field name="channel_id" ref="channel_public"/>
             <field name="category_id" ref="category_1"/>
@@ -66,7 +66,7 @@
             <field name="tag_ids" eval="[(4, ref('tag4'))]"/>
         </record>
         <record id="slide_4" model="slide.slide">
-            <field name="name">OpenERP SEO - Boost Your Website Trafic</field>
+            <field name="name">Odoo SEO - Boost Your Website Trafic</field>
             <field name="url">https://www.youtube.com/watch?v=5PKqZpl0TcA</field>
             <field name="channel_id" ref="channel_public"/>
             <field name="category_id" ref="category_1"/>
@@ -74,7 +74,7 @@
             <field name="tag_ids" eval="[(4, ref('tag1'))]"/>
         </record>
         <record id="slide_5" model="slide.slide">
-            <field name="name">OpenERP POS Indiegogo Campaign</field>
+            <field name="name">Odoo POS Indiegogo Campaign</field>
             <field name="url">https://www.youtube.com/watch?v=C_Laaz4mORg</field>
             <field name="channel_id" ref="channel_public"/>
             <field name="category_id" ref="category_1"/>
@@ -166,7 +166,7 @@
             <field name="website_published" eval="True"/>
             <field name="likes">10</field>
             <field name="slide_views">4718</field>
-            <field name="index_content">1. Open Source CMS  A performance comparision Mantavya Gajjar – Managining Director, OpenERP India
+            <field name="index_content">1. Open Source CMS  A performance comparision Mantavya Gajjar – Managining Director, Odoo India
 2. Topics 1 2 3 4 5 o Introduction – Products to Compare – Test Environment o Test Cases (home, catalogue, product pages) – Performance ● Google PageSpeed Inside ● Speed Test using Pingdom – Scalability ● Load Test using Blitz – Maintainability ● Source Code – cloc ● Community to maintain the source code – W3C Markup Validations o Conclusion
 3. Introduction
 4. Introduction Open Source Products, compared with Odoo
diff --git a/addons/website_slides/static/src/js/slides_upload.js b/addons/website_slides/static/src/js/slides_upload.js
index 1dc10f0e845..ea7ec99e401 100644
--- a/addons/website_slides/static/src/js/slides_upload.js
+++ b/addons/website_slides/static/src/js/slides_upload.js
@@ -87,7 +87,7 @@ var SlideDialog = Widget.extend({
             return;
         }
         if (file.size / 1024 / 1024 > 15) {
-            this.display_alert(_t("File is too big. Please select file upto 15MB"));
+            this.display_alert(_t("File is too big. File size cannot exceed 15MB"));
             this.reset_file();
             return;
         }