[MERGE] Merged with addons/trunk, except access rules for mail_mail.

bzr revid: tde@openerp.com-20120914141806-lprl9h4eaa4d4bvk

3 files changed, 9 insertions, 12 deletions

diff --git a/addons/base_setup/base_setup_views.xml b/addons/base_setup/base_setup_views.xml
index e07f576aa41..949a39159ac 100644
--- a/addons/base_setup/base_setup_views.xml
+++ b/addons/base_setup/base_setup_views.xml
@@ -6,9 +6,6 @@
         <record id="base.menu_res_company_global" model="ir.ui.menu">
             <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
         </record>
-        <record id="base.menu_publisher_warranty" model="ir.ui.menu">
-            <field name="groups_id" eval="[(3, ref('base.group_no_one'))]"/>
-        </record>
 
         <!-- Specify your terminology config wiz -->
         <record id="base_setup_terminology_form" model="ir.ui.view">
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py
index e1920fc05d9..0dc4a0f0794 100644
--- a/addons/base_setup/res_config.py
+++ b/addons/base_setup/res_config.py
@@ -25,16 +25,16 @@ class base_config_settings(osv.osv_memory):
     _name = 'base.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_multi_company': fields.boolean('manage multiple companies',
+        'module_multi_company': fields.boolean('Manage multiple companies',
             help="""Work in multi-company environments, with appropriate security access between companies.
                 This installs the module multi_company."""),
-        'module_share': fields.boolean('allow documents sharing',
+        'module_share': fields.boolean('Allow documents sharing',
             help="""Share or embbed any screen of openerp."""),
-        'module_portal': fields.boolean('activate the customer/supplier portal',
+        'module_portal': fields.boolean('Activate the customer/supplier portal',
             help="""Give access your customers and suppliers to their documents."""),
-        'module_auth_anonymous': fields.boolean('activate the public portal',
+        'module_auth_anonymous': fields.boolean('Activate the public portal',
             help="""Enable the public part of openerp, openerp becomes a public website."""),
-        'module_auth_oauth': fields.boolean('use external authentication providers, sign in with google, facebook, ...'),
+        'module_auth_oauth': fields.boolean('Use external authentication providers, sign in with google, facebook, ...'),
         'module_base_import': fields.boolean("Allow users to import data from CSV files"),
     }
 
@@ -57,17 +57,17 @@ class sale_config_settings(osv.osv_memory):
     _name = 'sale.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_web_linkedin': fields.boolean('get contacts automatically from LinkedIn',
+        'module_web_linkedin': fields.boolean('Get contacts automatically from linkedIn',
             help="""When you create a new contact (person or company), you will be able to load all the data from LinkedIn (photos, address, etc)."""),
         'module_crm': fields.boolean('CRM'),
-        'module_plugin_thunderbird': fields.boolean('enable Thunderbird plugin',
+        'module_plugin_thunderbird': fields.boolean('Enable Thunderbird plugin',
             help="""The plugin allows you archive email and its attachments to the selected
                 OpenERP objects. You can select a partner, or a lead and
                 attach the selected mail as a .eml file in
                 the attachment of a selected record. You can create documents for CRM Lead,
                 Partner from the selected emails.
                 This installs the module plugin_thunderbird."""),
-        'module_plugin_outlook': fields.boolean('enable Outlook plugin',
+        'module_plugin_outlook': fields.boolean('Enable Outlook plugin',
             help="""The Outlook plugin allows you to select an object that you would like to add
                 to your email and its attachments from MS Outlook. You can select a partner,
                 or a lead object and archive a selected
diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml
index 2b717b6e0b1..c06ff6534d7 100644
--- a/addons/base_setup/res_config_view.xml
+++ b/addons/base_setup/res_config_view.xml
@@ -16,7 +16,7 @@
                     <div>
                         <p>
                             <label string="You will find more options in your company details: address for the header and footer, overdue payments texts, etc."/>
-                            <button type="object" name="open_company" string="Configure Your Company Data" icon="gtk-execute" class="oe_inline oe_link"/>
+                            <button type="object" name="open_company" string="Configure your company data" icon="gtk-execute" class="oe_inline oe_link"/>
                         </p>
                     </div>
                     <group>