diff --git a/bin/addons/base/base_update.xml b/bin/addons/base/base_update.xml
index 756085896bb..b16fb508ecb 100644
--- a/bin/addons/base/base_update.xml
+++ b/bin/addons/base/base_update.xml
@@ -194,9 +194,8 @@
                     <separator string="" colspan="4"/>
                     <label string="" colspan="1"/>
                     <group col="3" colspan="2">
-                        <button icon='gtk-cancel' special="cancel" name="action_next" type='object' string='Skip &amp; Continue'/>
-                        <button name='action_new' icon='gtk-ok' type='object' string='Add New User'/>
-                        <button name='action_continue' icon='gtk-go-forward' type='object' string='Add &amp; Continue'/>
+                        <button icon='gtk-cancel' special="cancel" name="action_next" type='object' string='Close'/>
+                        <button name='action_new' icon='gtk-ok' type='object' string='Add User'/>
                     </group>
                 </form>
             </field>
diff --git a/bin/addons/base/module/module.py b/bin/addons/base/module/module.py
index 9f1035b3528..836a6a3ed7d 100644
--- a/bin/addons/base/module/module.py
+++ b/bin/addons/base/module/module.py
@@ -222,8 +222,8 @@ class module(osv.osv):
     _columns = {
         'name': fields.char("Name", size=128, readonly=True, required=True),
         'category_id': fields.many2one('ir.module.category', 'Category', readonly=True),
-        'shortdesc': fields.char('Short description', size=256, readonly=True),
-        'description': fields.text("Description", readonly=True),
+        'shortdesc': fields.char('Short description', size=256, readonly=True, translate=True),
+        'description': fields.text("Description", readonly=True, translate=True),
         'author': fields.char("Author", size=128, readonly=True),
         'website': fields.char("Website", size=256, readonly=True),
         'installed_version': fields.function(_get_installed_version, method=True,
@@ -242,7 +242,7 @@ class module(osv.osv):
             ('to install','To be installed')
         ], string='State', readonly=True),
         'demo': fields.boolean('Demo data'),
-        'license': fields.selection([('GPL-2', 'GPL-2'),
+        'license': fields.selection([('GPL-2', 'GPL-2'),('GPL-3', 'GPL-3'),
             ('Other proprietary', 'Other proprietary')], string='License',
             readonly=True),
     }
diff --git a/bin/addons/base/res/partner/partner_view.xml b/bin/addons/base/res/partner/partner_view.xml
index aabe4196ca8..a4948f3915b 100644
--- a/bin/addons/base/res/partner/partner_view.xml
+++ b/bin/addons/base/res/partner/partner_view.xml
@@ -168,13 +168,31 @@
             </field>
         </record>
         <record id="action_partner_title" model="ir.actions.act_window">
-            <field name="name">Partners Titles</field>
+            <field name="name">Titles</field>
             <field name="type">ir.actions.act_window</field>
             <field name="res_model">res.partner.title</field>
             <field name="view_type">form</field>
         </record>
         <menuitem action="action_partner_title" id="menu_partner_title" parent="base.menu_base_config"/>
 
+        <record id="action_partner_title_partner" model="ir.actions.act_window">
+            <field name="name">Partners Titles</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.partner.title</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('domain','=','partner')]</field>
+        </record>
+        <menuitem action="action_partner_title_partner" id="menu_partner_title_partner" parent="action_partner_title"/>
+
+        <record id="action_partner_title_contact" model="ir.actions.act_window">
+            <field name="name">Contacts Titles</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="res_model">res.partner.title</field>
+            <field name="view_type">form</field>
+            <field name="domain">[('domain','=','contact')]</field>
+        </record>
+        <menuitem action="action_partner_title_contact" id="menu_partner_title_contact" parent="action_partner_title"/>
+
         <!--
     =======================
     Partner
@@ -188,11 +206,10 @@
             <field name="arch" type="xml">
                 <tree string="Partners">
                     <field name="name"/>
+                    <field name="title"/>
+                    <field name="ref"/>
                     <field name="city"/>
                     <field name="country"/>
-                    <field name="title" string="Type"/>
-                    <field name="ref"/>
-                    <field name="address" string="# of Contacts"/>
                     <field name="lang"/>
                 </tree>
             </field>