diff --git a/addons/crm/res_config.py b/addons/crm/res_config.py
index b4a9e368d4c..92789f498cd 100644
--- a/addons/crm/res_config.py
+++ b/addons/crm/res_config.py
@@ -29,7 +29,7 @@ class crm_configuration(osv.osv_memory):
         'module_crm_caldav': fields.boolean("Caldav Synchronization",
             help="""Use protocol caldav to synchronize meetings with other calendar applications (like Sunbird).
                 This installs the module crm_caldav."""),
-        'fetchmail_lead': fields.boolean("Create leads from an email account",
+        'fetchmail_lead': fields.boolean("Create Leads from Incoming Mails",
             fetchmail_model='crm.lead', fetchmail_name='Incoming leads',
             help="""Allows you to configure your incoming mail server, and create leads from incoming emails."""),
         'lead_server': fields.char('Server', size=256),
diff --git a/addons/product/product_view.xml b/addons/product/product_view.xml
index 2a12fc9ad08..cd2772af1d0 100644
--- a/addons/product/product_view.xml
+++ b/addons/product/product_view.xml
@@ -140,7 +140,7 @@
                             <group colspan="2" col="2" name="delay">
                                 <separator string="Delays" colspan="2"/>
                                 <field name="sale_delay" attrs="{'readonly':[('sale_ok','=',0)]}"/>
-                                <field name="produce_delay"/>
+                                <field name="produce_delay" attrs="{'invisible':[('type','=','service')]}"/>
                                 <field name="warranty"/>
                             </group>
                             <group colspan="2" col="2" name="store">
@@ -454,14 +454,14 @@
             </field>
         </record>
         <record id="product_uom_categ_form_action" model="ir.actions.act_window">
-            <field name="name">UoM Categories</field>
+            <field name="name">Unit of Measure Categories</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">product.uom.categ</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
             <field name="help">Create and manage the units of measure categories you want to be used in your system. If several units of measure are in the same category, they can be converted to each other. For example, in the unit of measure category "Time", you will have the following UoM: Hours, Days.</field>
         </record>
-        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="base.menu_base_config" sequence="25"/>
+        <menuitem action="product_uom_categ_form_action" id="menu_product_uom_categ_form_action" parent="base.menu_base_config" sequence="25" groups="product.group_uom"/>
 
         <record id="product_ul_form_view" model="ir.ui.view">
             <field name="name">product.ul.form.view</field>
diff --git a/addons/project_issue/res_config.py b/addons/project_issue/res_config.py
index 1944444923a..92d43162d35 100644
--- a/addons/project_issue/res_config.py
+++ b/addons/project_issue/res_config.py
@@ -26,7 +26,7 @@ class project_issue_settings(osv.osv_memory):
     _inherit = ['project.config.settings', 'fetchmail.config.settings']
 
     _columns = {
-        'fetchmail_issue': fields.boolean("Create issues from an email account",
+        'fetchmail_issue': fields.boolean("Create issues from Incoming Mails",
             fetchmail_model='project.issue', fetchmail_name='Incoming issues',
             help="""Allows you to configure your incoming mail server, and create issues from incoming emails."""),
         'issue_server' : fields.char('Server', size=256),
diff --git a/addons/sale/res_config.py b/addons/sale/res_config.py
index 95590f8f0c6..cb08443d41e 100644
--- a/addons/sale/res_config.py
+++ b/addons/sale/res_config.py
@@ -33,7 +33,7 @@ class sale_configuration(osv.osv_memory):
         'group_invoice_deli_orders': fields.boolean('Based on Delivery Orders',
             implied_group='sale.group_invoice_deli_orders',
             help="To allow your salesman to make invoices for Delivery Orders using the menu 'Deliveries to Invoice'."),
-        'task_work': fields.boolean('Based on Tasks\' Work',
+        'task_work': fields.boolean('Tasks\' activity',
             help="""Lets you transfer the entries under tasks defined for Project Management to
                 the Timesheet line entries for particular date and particular user  with the effect of creating, editing and deleting either ways
                 and to automatically creates project tasks from procurement lines.
@@ -42,13 +42,17 @@ class sale_configuration(osv.osv_memory):
             help = """For modifying account analytic view to show important data to project manager of services companies.
                 You can also view the report of account analytic summary user-wise as well as month wise.
                 This installs the module account_analytic_analysis."""),
-        'module_account_analytic_analysis': fields.boolean('Manage Contracts',
-            help = """This installs the module account_analytic_analysis."""),
+        'module_account_analytic_analysis': fields.boolean('Manage Customer Contracts',
+            help = """Allows to define your customer contracts conditions: invoicing
+            method (fixed price, on timesheet, advance invoice), the exact pricing 
+            (650€/day for a developer), the duration (one year support contract). 
+            You will be able to follow the progress of the contract and invoice automatically. 
+            It installs the account_analytic_analysis module."""),
         'default_order_policy': fields.selection(
             [('manual', 'Invoice Based on Sales Orders'), ('picking', 'Invoice Based on Deliveries')],
-            'Main Method Based On', required=True, default_model='sale.order',
+            'Default Method', required=True, default_model='sale.order',
             help="You can generate invoices based on sales orders or based on shippings."),
-        'module_delivery': fields.boolean('Charge Delivery Costs',
+        'module_delivery': fields.boolean('Charge Shipping Cost',
             help ="""Allows you to add delivery methods in sale orders and delivery orders.
                 You can define your own carrier and delivery grids for prices.
                 This installs the module delivery."""),
@@ -59,7 +63,7 @@ class sale_configuration(osv.osv_memory):
             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."""),
-        'group_uom':fields.boolean("Manage Different UoM for Products",
+        'group_uom':fields.boolean("Allow Different Units of Measure",
             implied_group='product.group_uom',
             help="""Allows you to select and maintain different units of measure for products."""),
         'group_sale_delivery_address': fields.boolean("Allow Different Addresses for Delivery and Invoice",
@@ -72,9 +76,10 @@ class sale_configuration(osv.osv_memory):
             help="""Allows to format sale order lines using notes, separators, titles and subtotals.
                 This installs the module sale_layout."""),
         'module_warning': fields.boolean("Alerts by Products or Customers",
-            help="""To raise user specific warning messages on different products used in Sales Orders, Purchase Orders, Invoices and Deliveries.
-                This installs the module warning."""),
-        'module_sale_margin': fields.boolean("Display Margins for Users",
+            help="""Allow to configure warnings on products and trigger them when a user wants to sale a given product or a given customer. 
+            Example: Product: this product is deprecated, do not purchase more than 5.
+            Supplier: don't forget to ask for an express delivery."""),
+        'module_sale_margin': fields.boolean("Display Margins on Sale Orders",
             help="""This adds the 'Margin' on sales order.
                 This gives the profitability by calculating the difference between the Unit Price and Cost Price.
                 This installs the module sale_margin."""),
@@ -82,7 +87,7 @@ class sale_configuration(osv.osv_memory):
             help="""Allows you to categorize your sales and deliveries (picking lists) between different journals,
                 and perform batch operations on journals.
                 This installs the module sale_journal."""),
-        'module_analytic_user_function': fields.boolean("User Function by Contract",
+        'module_analytic_user_function': fields.boolean("Assign User Roles per Contract",
             help="""Allows you to define what is the default function of a specific user on a given account.
                 This is mostly used when a user encodes his timesheet. The values are retrieved and the fields are auto-filled.
                 But the possibility to change these values is still available.
@@ -90,6 +95,9 @@ class sale_configuration(osv.osv_memory):
         'module_analytic_journal_billing_rate': fields.boolean("Billing Rates by Contract",
             help="""Allows you to define the default invoicing rate for a specific journal on a given account.
                 This installs the module analytic_journal_billing_rate."""),
+        'group_multiple_shops':fields.boolean("Manage Multiple Shops",
+            implied_group='sale.group_multiple_shops',
+            help="""This allows to configure and use multiple Shops instead of having a single default one."""),                
         'module_project_timesheet': fields.boolean("Project Timesheet"),
         'module_project_mrp': fields.boolean("Project MRP"),
         'module_project': fields.boolean("Project"),
diff --git a/addons/sale/res_config_view.xml b/addons/sale/res_config_view.xml
index 5c64121038b..1e21a30f570 100644
--- a/addons/sale/res_config_view.xml
+++ b/addons/sale/res_config_view.xml
@@ -19,7 +19,6 @@
                     <field name="task_work" on_change="onchange_task_work(task_work)"/>
                     <field name="module_project_timesheet" invisible="1"/>
                     <field name="module_project_mrp" invisible="1"/>
-                    <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
                     <newline/>
                     <field name="timesheet" on_change="onchange_timesheet(timesheet)"/>
                     <field name="time_unit" domain="[('category_id.name','=','Working Time')]"
@@ -34,11 +33,12 @@
                     <field name="module_sale_layout"/>
                     <field name="module_warning"/>
                     <field name="module_sale_journal"/>
-
+                    <field name="group_multiple_shops"/>
+                    <field name="default_picking_policy" attrs="{'invisible':[('group_invoice_deli_orders','=',False)]}"/>
                     <separator string="Contracts" colspan="4"/>
                     <field name="module_account_analytic_analysis" on_change="onchange_timesheet(module_account_analytic_analysis)"/>
-                    <field name="module_analytic_user_function"/>
-                    <field name="module_analytic_journal_billing_rate"/>
+                    <field name="module_analytic_user_function" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
+                    <field name="module_analytic_journal_billing_rate" attrs="{'invisible':[('module_account_analytic_analysis','=',False)]}"/>
                 </group>
             </field>
         </record>
diff --git a/addons/sale/security/sale_security.xml b/addons/sale/security/sale_security.xml
index 0cb55fb0d30..30ef1b57c95 100644
--- a/addons/sale/security/sale_security.xml
+++ b/addons/sale/security/sale_security.xml
@@ -55,6 +55,10 @@
     <record model="ir.ui.menu" id="base.menu_base_config">
         <field eval="[(4, ref('base.group_sale_manager'))]" name="groups_id"/>
     </record>
+    <record id="group_multiple_shops" model="res.groups">
+        <field name="name">Manage Multiple Shops</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>	
 
     <!-- Multi - Company Rules -->