[MERGE] merged hsa's branch lp:~openerp-dev/openobject-addons/trunk-en-us-police-improvements-bde-imp-hsa

bzr revid: bde@tinyerp.com-20121231124018-t14yu1kkm0jbskwa

9 files changed, 11 insertions, 11 deletions

diff --git a/addons/account/account_view.xml b/addons/account/account_view.xml
index 19128b42d6e..1c7c268e905 100644
--- a/addons/account/account_view.xml
+++ b/addons/account/account_view.xml
@@ -1791,7 +1791,7 @@
                         <field name="name"/>
                         <field name="active"/>
                     </group>
-                    <field name="note" placeholder="Note fo the invoice..."/>
+                    <field name="note" placeholder="Note for the invoice..."/>
                     <separator string="Computation"/>
                     <field name="line_ids"/>
                 </form>
diff --git a/addons/account/res_config.py b/addons/account/res_config.py
index 8f525795d1c..371e530c9e4 100644
--- a/addons/account/res_config.py
+++ b/addons/account/res_config.py
@@ -113,7 +113,7 @@ class account_config_settings(osv.osv_memory):
         'default_purchase_tax': fields.many2one('account.tax', 'Default purchase tax',
             help="This purchase tax will be assigned by default on new products."),
         'decimal_precision': fields.integer('Decimal precision on journal entries',
-            help="""As an example, a decimal precision of 2 will allow journal entries  like: 9.99 EUR, whereas a decimal precision of 4 will allow journal  entries like: 0.0231 EUR."""),
+            help="""As an example, a decimal precision of 2 will allow journal entries  like: 9.99 USD, whereas a decimal precision of 4 will allow journal  entries like: 0.0231 USD."""),
         'group_multi_currency': fields.boolean('Allow multi currencies',
             implied_group='base.group_multi_currency',
             help="Allows you multi currency environment"),
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 697ed6bacea..e0978847acb 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -266,7 +266,7 @@
                 Each employee may be assigned an Appraisal Plan. Such a plan
                 defines the frequency and the way you manage your periodic
                 personnel evaluation. You will be able to define steps and
-                attach interviews to each step. OpenERP manages all kind of
+                attach interviews to each step. OpenERP manages all kinds of
                 evaluations: bottom-up, top-down, self-evaluation and final
                 evaluation by the manager.
               </p>
diff --git a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
index cc531fc8f10..0ebe16ad49f 100644
--- a/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
+++ b/addons/hr_timesheet_invoice/hr_timesheet_invoice_demo.xml
@@ -7,7 +7,7 @@
             <field name="factor">50.0</field>
         </record>
         <record id="timesheet_invoice_factor3" model="hr_timesheet_invoice.factor">
-            <field name="name">Gratis</field>
+            <field name="name">Free of charge</field>
             <field name="customer_name">Offered developments</field>
             <field name="factor">100.0</field>
         </record>
diff --git a/addons/mail/static/src/xml/mail.xml b/addons/mail/static/src/xml/mail.xml
index caa85cd3deb..bfd0e4cd10f 100644
--- a/addons/mail/static/src/xml/mail.xml
+++ b/addons/mail/static/src/xml/mail.xml
@@ -197,8 +197,8 @@
 
             <div class="oe_msg_center">
                 <div class='oe_msg_icons'>
-                    <span class='oe_read' t-if="widget.show_read_unread_button"><a title="Read" class="oe_e">X</a></span>
-                    <span class='oe_unread' t-if="widget.show_read_unread_button"><a title="Set back to unread" class="oe_e">v</a></span>
+                    <span class='oe_read' t-if="widget.show_read_unread_button"><a title="Mark as read" class="oe_e">X</a></span>
+                    <span class='oe_unread' t-if="widget.show_read_unread_button"><a title="Mark as unread" class="oe_e">v</a></span>
                     <span class='oe_reply' t-if="widget.show_reply_button"><a title="Reply" class="oe_e">(</a></span>
                     <span t-attf-class="oe_star #{widget.is_favorite?'oe_starred':''}"><a title="Add To Favorites" class="oe_e">7</a></span>
                 </div>
diff --git a/addons/purchase/res_config.py b/addons/purchase/res_config.py
index 19b059d4d5b..de86cc7a2ed 100644
--- a/addons/purchase/res_config.py
+++ b/addons/purchase/res_config.py
@@ -36,7 +36,7 @@ class purchase_config_settings(osv.osv_memory):
         'group_purchase_pricelist':fields.boolean("Manage pricelist per supplier",
             implied_group='product.group_purchase_pricelist',
             help="""Allows to manage different prices based on rules per category of Supplier.
-                Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
+                Example: 10% for retailers, promotion of 5 USD on this product, etc."""),
         'group_uom':fields.boolean("Manage different units of measure for products",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 9ff3863bb7b..74dc1466a8c 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -44,7 +44,7 @@ class sale_configuration(osv.osv_memory):
         'group_sale_pricelist':fields.boolean("Use pricelists to adapt your price per customers",
             implied_group='product.group_sale_pricelist',
             help="""Allows to manage different prices based on rules per category of customers.
-                Example: 10% for retailers, promotion of 5 EUR on this product, etc."""),
+Example: 10% for retailers, promotion of 5 USD on this product, etc."""),
         'group_uom':fields.boolean("Allow using different units of measures",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
diff --git a/addons/stock/product_view.xml b/addons/stock/product_view.xml
index 250fe5245e7..594843eff8d 100644
--- a/addons/stock/product_view.xml
+++ b/addons/stock/product_view.xml
@@ -41,7 +41,7 @@
             		<field name="sale_delay" attrs="{'readonly':[('sale_ok','=',False)]}"/>
             	</group>
             	<group name="delay" position="after">
-            		<group name="store" string="Storage Localization">
+            		<group name="store" string="Storage Location">
                         <field name="loc_rack"/>
                         <field name="loc_row"/>
                     	<field name="loc_case"/>
@@ -103,7 +103,7 @@
                     </group>
                 </group>
                 <group name="status" position="after" version="7.0">
-                     <group name="store" string="Storage Localization">
+                     <group name="store" string="Storage Location">
                          <field name="company_id" groups="base.group_multi_company" widget="selection"/>
                          <field name="loc_rack" attrs="{'invisible':[('type','=','service')]}"/>
                          <field name="loc_row" attrs="{'invisible':[('type','=','service')]}"/>
diff --git a/addons/stock/stock_view.xml b/addons/stock/stock_view.xml
index c63c385967e..9c2a672caf7 100644
--- a/addons/stock/stock_view.xml
+++ b/addons/stock/stock_view.xml
@@ -126,7 +126,7 @@
                         </group>
                     </group>
                     <notebook>
-                    <page string="General Informations">
+                    <page string="General Information">
                         <field name="inventory_line_id">
                             <tree string="Products" editable="bottom">
                                 <field domain="[('usage','=','internal')]" name="location_id" groups="stock.group_locations"/>