[MERGE] from trunk

bzr revid: xmo@openerp.com-20131007085750-hkv4fgeph0cc65eb

78 files changed, 165 insertions, 1270 deletions

diff --git a/addons/base_calendar/base_calendar.py b/addons/base_calendar/base_calendar.py
index 6194324e183..397bd193757 100644
--- a/addons/base_calendar/base_calendar.py
+++ b/addons/base_calendar/base_calendar.py
@@ -114,19 +114,6 @@ def real_id2base_calendar_id(real_id, recurrent_date):
         return '%d-%s' % (real_id, recurrent_date)
     return real_id
 
-def _links_get(self, cr, uid, context=None):
-    """
-    Get request link.
-    @param cr: the current row, from the database cursor
-    @param uid: the current user's ID for security checks
-    @param context: a standard dictionary for contextual values
-    @return: list of dictionary which contain object and name and id
-    """
-    obj = self.pool.get('res.request.link')
-    ids = obj.search(cr, uid, [])
-    res = obj.read(cr, uid, ids, ['object', 'name'], context=context)
-    return [(r['object'], r['name']) for r in res]
-
 html_invitation = """
 <html>
 <head>
@@ -307,19 +294,6 @@ class calendar_attendee(osv.osv):
 
         return result
 
-    def _links_get(self, cr, uid, context=None):
-        """
-        Get request link for ref field in calendar attendee.
-        @param cr: the current row, from the database cursor
-        @param uid: the current user's id for security checks
-        @param context: A standard dictionary for contextual values
-        @return: list of dictionary which contain object and name and id
-        """
-        obj = self.pool.get('res.request.link')
-        ids = obj.search(cr, uid, [])
-        res = obj.read(cr, uid, ids, ['object', 'name'], context=context)
-        return [(r['object'], r['name']) for r in res]
-
     def _lang_get(self, cr, uid, context=None):
         """
         Get language for language selection field.
@@ -385,7 +359,7 @@ property or property parameter."),
         'event_end_date': fields.function(_compute_data, \
                             string='Event End Date', type="datetime", \
                             multi='event_end_date'),
-        'ref': fields.reference('Event Ref', selection=_links_get, size=128),
+        'ref': fields.reference('Event Ref', selection=openerp.addons.base.res.res_request.referencable_models, size=128),
         'availability': fields.selection([('free', 'Free'), ('busy', 'Busy')], 'Free/Busy', readonly="True"),
     }
     _defaults = {
diff --git a/addons/crm/crm.py b/addons/crm/crm.py
index dc7ebf3ca95..98581b91666 100644
--- a/addons/crm/crm.py
+++ b/addons/crm/crm.py
@@ -258,13 +258,6 @@ class crm_case_resource_type(osv.osv):
         'section_id': fields.many2one('crm.case.section', 'Sales Team'),
     }
 
-def _links_get(self, cr, uid, context=None):
-    """Gets links value for reference field"""
-    obj = self.pool.get('res.request.link')
-    ids = obj.search(cr, uid, [])
-    res = obj.read(cr, uid, ids, ['object', 'name'], context)
-    return [(r['object'], r['name']) for r in res]
-
 class crm_payment_mode(osv.osv):
     """ Payment Mode for Fund """
     _name = "crm.payment.mode"
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index fcfec50d344..bb080a95399 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -23,6 +23,7 @@ import crm
 from datetime import datetime
 from operator import itemgetter
 
+import openerp
 from openerp import SUPERUSER_ID
 from openerp import tools
 from openerp.addons.base.res.res_partner import format_address
@@ -258,8 +259,8 @@ class crm_lead(format_address, osv.osv):
         # Only used for type opportunity
         'probability': fields.float('Success Rate (%)', group_operator="avg"),
         'planned_revenue': fields.float('Expected Revenue', track_visibility='always'),
-        'ref': fields.reference('Reference', selection=crm._links_get, size=128),
-        'ref2': fields.reference('Reference 2', selection=crm._links_get, size=128),
+        'ref': fields.reference('Reference', selection=openerp.addons.base.res.res_request.referencable_models),
+        'ref2': fields.reference('Reference 2', selection=openerp.addons.base.res.res_request.referencable_models),
         'phone': fields.char("Phone", size=64),
         'date_deadline': fields.date('Expected Closing', help="Estimate of the date on which the opportunity will be won."),
         'date_action': fields.date('Next Action Date', select=True),
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index a3b09c272f6..1b9cb0b0c50 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import openerp
 from openerp.addons.crm import crm
 from openerp.osv import fields, osv
 from openerp import tools
@@ -83,7 +84,7 @@ class crm_claim(osv.osv):
         'date_deadline': fields.date('Deadline'),
         'date_closed': fields.datetime('Closed', readonly=True),
         'date': fields.datetime('Claim Date', select=True),
-        'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
+        'ref': fields.reference('Reference', selection=openerp.addons.base.res.res_request.referencable_models),
         'categ_id': fields.many2one('crm.case.categ', 'Category', \
                             domain="[('section_id','=',section_id),\
                             ('object_id.model', '=', 'crm.claim')]"),
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index 80a86c87c7c..5f84d45f974 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -19,6 +19,7 @@
 #
 ##############################################################################
 
+import openerp
 from openerp.addons.crm import crm
 from openerp.osv import fields, osv
 from openerp import tools
@@ -53,8 +54,8 @@ class crm_helpdesk(osv.osv):
             'email_cc': fields.text('Watchers Emails', size=252 , help="These email addresses will be added to the CC field of all inbound and outbound emails for this record before being sent. Separate multiple email addresses with a comma"),
             'email_from': fields.char('Email', size=128, help="Destination email for email gateway"),
             'date': fields.datetime('Date'),
-            'ref' : fields.reference('Reference', selection=crm._links_get, size=128),
-            'ref2' : fields.reference('Reference 2', selection=crm._links_get, size=128),
+            'ref': fields.reference('Reference', selection=openerp.addons.base.res.res_request.referencable_models),
+            'ref2': fields.reference('Reference 2', selection=openerp.addons.base.res.res_request.referencable_models),
             'channel_id': fields.many2one('crm.case.channel', 'Channel', help="Communication channel."),
             'planned_revenue': fields.float('Planned Revenue'),
             'planned_cost': fields.float('Planned Costs'),
diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 1ed3f263d10..364f9f5d954 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -347,26 +347,9 @@ class res_users(osv.osv):
     _name = 'res.users'
     _inherit = 'res.users'
 
-    def create(self, cr, uid, data, context=None):
-        user_id = super(res_users, self).create(cr, uid, data, context=context)
-
-        # add shortcut unless 'noshortcut' is True in context
-        if not(context and context.get('noshortcut', False)):
-            data_obj = self.pool.get('ir.model.data')
-            try:
-                data_id = data_obj._get_id(cr, uid, 'hr', 'ir_ui_view_sc_employee')
-                view_id  = data_obj.browse(cr, uid, data_id, context=context).res_id
-                self.pool.get('ir.ui.view_sc').copy(cr, uid, view_id, default = {
-                                            'user_id': user_id}, context=context)
-            except:
-                # Tolerate a missing shortcut. See product/product.py for similar code.
-                _logger.debug('Skipped meetings shortcut for user "%s".', data.get('name','<new'))
-
-        return user_id
-
     _columns = {
         'employee_ids': fields.one2many('hr.employee', 'user_id', 'Related employees'),
-        }
+    }
 
 
 
diff --git a/addons/hr/hr_view.xml b/addons/hr/hr_view.xml
index 05a21c2908a..99fbe6db1f5 100644
--- a/addons/hr/hr_view.xml
+++ b/addons/hr/hr_view.xml
@@ -224,13 +224,6 @@
 
         <menuitem action="open_view_employee_list_my" id="menu_open_view_employee_list_my" sequence="3" parent="menu_hr_main"/>
 
-        <record id="ir_ui_view_sc_employee" model="ir.ui.view_sc">
-            <field name="name">Employees</field>
-            <field name="resource">ir.ui.menu</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="res_id" ref="hr.menu_open_view_employee_list_my"/>
-        </record>
-
         <!-- Employee architecture -->
         <record id="view_partner_tree2" model="ir.ui.view">
             <field name="name">hr.employee.tree</field>
diff --git a/addons/product/__openerp__.py b/addons/product/__openerp__.py
index fdadda2e4d4..da17f7d8f6a 100644
--- a/addons/product/__openerp__.py
+++ b/addons/product/__openerp__.py
@@ -54,7 +54,6 @@ Print product labels with barcode.
         'product_data.xml',
         'product_report.xml',
         'product_view.xml',
-        'product_shortcut_data.xml',
         'pricelist_view.xml',
         'partner_view.xml',
         'process/product_process.xml'
diff --git a/addons/product/product_shortcut_data.xml b/addons/product/product_shortcut_data.xml
deleted file mode 100644
index 4f48445a197..00000000000
--- a/addons/product/product_shortcut_data.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="1">
-
-        <record id="ir_ui_view_sc_product0" model="ir.ui.view_sc">
-            <field name="name">Products</field>
-            <field name="resource">ir.ui.menu</field>
-            <field name="user_id" ref="base.user_root"/>
-            <field name="res_id" ref="product.menu_products"/>
-        </record>
-
-    </data>
-</openerp>
diff --git a/addons/resource/resource_view.xml b/addons/resource/resource_view.xml
index 5d573214187..8954adae80a 100644
--- a/addons/resource/resource_view.xml
+++ b/addons/resource/resource_view.xml
@@ -251,7 +251,7 @@
             <field name="view_mode">tree,form,calendar</field>
             <field name="search_view_id" ref="view_resource_calendar_leaves_search"/>
         </record>
-       <menuitem id="menu_resource_config" name="Resource" parent="base.next_id_4" sequence="5"/>
+       <menuitem id="menu_resource_config" name="Resource" parent="base.menu_custom" sequence="30"/>
        <menuitem action="resource.action_resource_calendar_leave_tree" id="menu_view_resource_calendar_leaves_search" parent="menu_resource_config" sequence="1"/>
     </data>
 </openerp>
diff --git a/addons/share/wizard/share_wizard.py b/addons/share/wizard/share_wizard.py
index f6ee6379ef1..2e8d4d9373e 100644
--- a/addons/share/wizard/share_wizard.py
+++ b/addons/share/wizard/share_wizard.py
@@ -289,32 +289,14 @@ class share_wizard(osv.TransientModel):
 
         return created_ids, existing_ids
 
-    def _create_shortcut(self, cr, uid, values, context=None):
+    def _create_action(self, cr, uid, values, context=None):
         if context is None:
             context = {}
         new_context = context.copy()
         for key in context:
             if key.startswith('default_'):
                 del new_context[key]
-
-        dataobj = self.pool.get('ir.model.data')
-        menu_id = dataobj._get_id(cr, uid, 'base', 'menu_administration_shortcut')
-        shortcut_menu_id  = int(dataobj.read(cr, uid, menu_id, ['res_id'], new_context)['res_id'])
         action_id = self.pool.get('ir.actions.act_window').create(cr, UID_ROOT, values, new_context)
-        menu_data = {'name': values['name'],
-                     'sequence': 10,
-                     'action': 'ir.actions.act_window,'+str(action_id),
-                     'parent_id': shortcut_menu_id,
-                     'icon': 'STOCK_JUSTIFY_FILL'}
-        menu_obj = self.pool.get('ir.ui.menu')
-        menu_id =  menu_obj.create(cr, UID_ROOT, menu_data)
-        sc_data = {'name': values['name'], 'sequence': UID_ROOT,'res_id': menu_id }
-        self.pool.get('ir.ui.view_sc').create(cr, uid, sc_data, new_context)
-
-        # update menu cache
-        user_groups = set(self.pool.get('res.users').read(cr, UID_ROOT, uid, ['groups_id'])['groups_id'])
-        key = (cr.dbname, shortcut_menu_id, tuple(user_groups))
-        menu_obj._cache[key] = True
         return action_id
 
     def _cleanup_action_context(self, context_str, user_id):
@@ -383,7 +365,7 @@ class share_wizard(osv.TransientModel):
         values = self._shared_action_def(cr, uid, wizard_data, context=None)
         user_obj = self.pool.get('res.users')
         for user_id in user_ids:
-            action_id = self._create_shortcut(cr, user_id, values)
+            action_id = self._create_action(cr, user_id, values)
             if make_home:
                 # We do this only for new share users, as existing ones already have their initial home
                 # action. Resetting to the default menu does not work well as the menu is rather empty
diff --git a/addons/web_shortcuts/LICENSE b/addons/web_shortcuts/LICENSE
deleted file mode 100644
index ff64be448e9..00000000000
--- a/addons/web_shortcuts/LICENSE
+++ /dev/null
@@ -1,15 +0,0 @@
-OpenERP, Open Source Management Solution
-Copyright © 2010-2011 OpenERP SA (<http://openerp.com>).
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as
-published by the Free Software Foundation, either version 3 of the
-License, or (at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public Lice
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/addons/web_shortcuts/__init__.py b/addons/web_shortcuts/__init__.py
deleted file mode 100644
index 99b6a1491e8..00000000000
--- a/addons/web_shortcuts/__init__.py
+++ /dev/null
@@ -1,21 +0,0 @@
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010 OpenERP s.a. (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/__openerp__.py b/addons/web_shortcuts/__openerp__.py
deleted file mode 100644
index aa23ed2bfa6..00000000000
--- a/addons/web_shortcuts/__openerp__.py
+++ /dev/null
@@ -1,44 +0,0 @@
-# -*- coding: utf-8 -*-
-##############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2010-2011 OpenERP s.a. (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-##############################################################################
-{
-    'name': 'Web Shortcuts',
-    'version': '1.0',
-    'category': 'Tools',
-    'description': """
-Enable shortcuts feature in the web client.
-===========================================
-
-Add a Shortcut icon in the systray in order to access the user's shortcuts (if any).
-
-Add a Shortcut icon besides the views title in order to add/remove a shortcut.
-    """,
-    'author': 'OpenERP SA',
-    'website': 'http://openerp.com',
-    'depends': ['base'],
-    'data': [],
-    'js' : ['static/src/js/web_shortcuts.js'],
-    'css' : ['static/src/css/web_shortcuts.css'],
-    'qweb' : ['static/src/xml/*.xml'],
-    'installable': True,
-    'auto_install': False,
-}
-
-# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/web_shortcuts/i18n/cs.po b/addons/web_shortcuts/i18n/cs.po
deleted file mode 100644
index fe42953dceb..00000000000
--- a/addons/web_shortcuts/i18n/cs.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Czech translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-02-20 13:43+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Czech <cs@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Přidat / Odebrat zkratku..."
diff --git a/addons/web_shortcuts/i18n/da.po b/addons/web_shortcuts/i18n/da.po
deleted file mode 100644
index 3cbeed065b5..00000000000
--- a/addons/web_shortcuts/i18n/da.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Danish translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-09-15 20:22+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Danish <da@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-16 05:42+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Tilføj/fjern genvej ..."
diff --git a/addons/web_shortcuts/i18n/de.po b/addons/web_shortcuts/i18n/de.po
deleted file mode 100644
index c6e3f2ba0d8..00000000000
--- a/addons/web_shortcuts/i18n/de.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# German translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-04 07:22+0000\n"
-"Last-Translator: Ferdinand @ Camptocamp <Unknown>\n"
-"Language-Team: German <de@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Hinzufügen/Entfernen Lesezeichen ..."
diff --git a/addons/web_shortcuts/i18n/el.po b/addons/web_shortcuts/i18n/el.po
deleted file mode 100644
index d8ee859a736..00000000000
--- a/addons/web_shortcuts/i18n/el.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Greek translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-09-30 20:14+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Greek <el@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-10-01 05:18+0000\n"
-"X-Generator: Launchpad (build 16774)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr ""
diff --git a/addons/web_shortcuts/i18n/en_GB.po b/addons/web_shortcuts/i18n/en_GB.po
deleted file mode 100644
index b80ba0e48f7..00000000000
--- a/addons/web_shortcuts/i18n/en_GB.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# English (United Kingdom) translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-08-23 16:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: English (United Kingdom) <en_GB@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Add / Remove Shortcut..."
diff --git a/addons/web_shortcuts/i18n/es.po b/addons/web_shortcuts/i18n/es.po
deleted file mode 100644
index bb120c90dd6..00000000000
--- a/addons/web_shortcuts/i18n/es.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Spanish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-12 12:54+0000\n"
-"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Añadir / Eliminar acceso directo..."
diff --git a/addons/web_shortcuts/i18n/fr.po b/addons/web_shortcuts/i18n/fr.po
deleted file mode 100644
index 1a2a90becc1..00000000000
--- a/addons/web_shortcuts/i18n/fr.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# French translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-01 08:11+0000\n"
-"Last-Translator: WANTELLET Sylvain <Swantellet@tetra-info.com>\n"
-"Language-Team: French <fr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Ajouter / supprimer un raccourci..."
diff --git a/addons/web_shortcuts/i18n/hr.po b/addons/web_shortcuts/i18n/hr.po
deleted file mode 100644
index 47a0f8f35cd..00000000000
--- a/addons/web_shortcuts/i18n/hr.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Croatian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-10 06:51+0000\n"
-"Last-Translator: Goran Kliska <gkliska@gmail.com>\n"
-"Language-Team: Croatian <hr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Dodaj / ukloni prečac..."
diff --git a/addons/web_shortcuts/i18n/hu.po b/addons/web_shortcuts/i18n/hu.po
deleted file mode 100644
index c91a6c93d36..00000000000
--- a/addons/web_shortcuts/i18n/hu.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Hungarian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-01-04 12:01+0000\n"
-"Last-Translator: krnkris <Unknown>\n"
-"Language-Team: Hungarian <hu@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Billentyűkombináció hozzáadása/eltávolítása"
diff --git a/addons/web_shortcuts/i18n/it.po b/addons/web_shortcuts/i18n/it.po
deleted file mode 100644
index e08a8ad8ca2..00000000000
--- a/addons/web_shortcuts/i18n/it.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Italian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-11-29 07:33+0000\n"
-"Last-Translator: Davide Corio <enlightx@gmail.com>\n"
-"Language-Team: Italian <it@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Aggiungi / Rimuovi Scorciatoia..."
diff --git a/addons/web_shortcuts/i18n/lt.po b/addons/web_shortcuts/i18n/lt.po
deleted file mode 100644
index 9f564849598..00000000000
--- a/addons/web_shortcuts/i18n/lt.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Lithuanian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-04-24 18:29+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Lithuanian <lt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Pridėti / pašalinti trumpinį..."
diff --git a/addons/web_shortcuts/i18n/mk.po b/addons/web_shortcuts/i18n/mk.po
deleted file mode 100644
index 21e7f37e589..00000000000
--- a/addons/web_shortcuts/i18n/mk.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Macedonian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-03-01 14:20+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Macedonian <mk@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Додади / Отстрани кратенка"
diff --git a/addons/web_shortcuts/i18n/mn.po b/addons/web_shortcuts/i18n/mn.po
deleted file mode 100644
index ffded75a811..00000000000
--- a/addons/web_shortcuts/i18n/mn.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Mongolian translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-02-07 11:26+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Mongolian <mn@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Шуут холбоосыг Нэмэх / Устгах ..."
diff --git a/addons/web_shortcuts/i18n/nl.po b/addons/web_shortcuts/i18n/nl.po
deleted file mode 100644
index 0f542966caf..00000000000
--- a/addons/web_shortcuts/i18n/nl.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Dutch translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-11-27 19:29+0000\n"
-"Last-Translator: Erwin van der Ploeg (BAS Solutions) <Unknown>\n"
-"Language-Team: Dutch <nl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Toevoegen/verwijderen snelkoppeling"
diff --git a/addons/web_shortcuts/i18n/pl.po b/addons/web_shortcuts/i18n/pl.po
deleted file mode 100644
index 54553cf463d..00000000000
--- a/addons/web_shortcuts/i18n/pl.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Polish translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-17 10:08+0000\n"
-"Last-Translator: Grzegorz Grzelak (OpenGLOBE.pl) <grzegorz@openglobe.pl>\n"
-"Language-Team: Polish <pl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Dodaj / Usuń skrót"
diff --git a/addons/web_shortcuts/i18n/pt.po b/addons/web_shortcuts/i18n/pt.po
deleted file mode 100644
index c7cf8d637b2..00000000000
--- a/addons/web_shortcuts/i18n/pt.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Portuguese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-05 10:09+0000\n"
-"Last-Translator: Andrei Talpa (multibase.pt) <andrei.talpa@multibase.pt>\n"
-"Language-Team: Portuguese <pt@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Adicionar / Remover atalho..."
diff --git a/addons/web_shortcuts/i18n/pt_BR.po b/addons/web_shortcuts/i18n/pt_BR.po
deleted file mode 100644
index 63e42f4c0b1..00000000000
--- a/addons/web_shortcuts/i18n/pt_BR.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Brazilian Portuguese translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-11-29 23:53+0000\n"
-"Last-Translator: Luiz Fernando M.França (Sig Informática) <Unknown>\n"
-"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Adicionar / Remover atalho ..."
diff --git a/addons/web_shortcuts/i18n/ro.po b/addons/web_shortcuts/i18n/ro.po
deleted file mode 100644
index 350c9fe7522..00000000000
--- a/addons/web_shortcuts/i18n/ro.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Romanian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-10 07:32+0000\n"
-"Last-Translator: ERPSystems.ro <mihai@erpsystems.ro>\n"
-"Language-Team: Romanian <ro@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Adauga / Sterge Shortcut..."
diff --git a/addons/web_shortcuts/i18n/ru.po b/addons/web_shortcuts/i18n/ru.po
deleted file mode 100644
index d7d092ab708..00000000000
--- a/addons/web_shortcuts/i18n/ru.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Russian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-25 12:18+0000\n"
-"Last-Translator: Chertykov Denis <chertykov@gmail.com>\n"
-"Language-Team: Russian <ru@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Добавить / Удалить ярлык..."
diff --git a/addons/web_shortcuts/i18n/sl.po b/addons/web_shortcuts/i18n/sl.po
deleted file mode 100644
index 480bf6e1f04..00000000000
--- a/addons/web_shortcuts/i18n/sl.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Slovenian translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-18 22:32+0000\n"
-"Last-Translator: Dušan Laznik (Mentis) <laznik@mentis.si>\n"
-"Language-Team: Slovenian <sl@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Dodaj / Odstrani bližnjico..."
diff --git a/addons/web_shortcuts/i18n/sv.po b/addons/web_shortcuts/i18n/sv.po
deleted file mode 100644
index 51d285d148d..00000000000
--- a/addons/web_shortcuts/i18n/sv.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Swedish translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-01-26 15:07+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Swedish <sv@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Lägg till/ta bort genväg..."
diff --git a/addons/web_shortcuts/i18n/th.po b/addons/web_shortcuts/i18n/th.po
deleted file mode 100644
index 87ee37b52cc..00000000000
--- a/addons/web_shortcuts/i18n/th.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Thai translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-06-17 05:48+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Thai <th@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "เพิ่ม / ลบ ทางลัด ..."
diff --git a/addons/web_shortcuts/i18n/tr.po b/addons/web_shortcuts/i18n/tr.po
deleted file mode 100644
index 077c845c317..00000000000
--- a/addons/web_shortcuts/i18n/tr.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Turkish translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-02-04 14:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Turkish <tr@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Kısayol Ekle/Kaldır..."
diff --git a/addons/web_shortcuts/i18n/vi.po b/addons/web_shortcuts/i18n/vi.po
deleted file mode 100644
index 4f6227de670..00000000000
--- a/addons/web_shortcuts/i18n/vi.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Vietnamese translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-06-27 16:15+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Vietnamese <vi@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "Thêm / Xóa đường dẫn ...."
diff --git a/addons/web_shortcuts/i18n/web_shortcuts.pot b/addons/web_shortcuts/i18n/web_shortcuts.pot
deleted file mode 100644
index 2babdff3864..00000000000
--- a/addons/web_shortcuts/i18n/web_shortcuts.pot
+++ /dev/null
@@ -1,24 +0,0 @@
-# Translation of OpenERP Server.
-# This file contains the translation of the following modules:
-#	* web_shortcuts
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: OpenERP Server 7.0alpha\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-12-21 17:06+0000\n"
-"Last-Translator: <>\n"
-"Language-Team: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
-"Plural-Forms: \n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr ""
-
diff --git a/addons/web_shortcuts/i18n/zh_CN.po b/addons/web_shortcuts/i18n/zh_CN.po
deleted file mode 100644
index 2c125e77d74..00000000000
--- a/addons/web_shortcuts/i18n/zh_CN.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Chinese (Simplified) translation for openobject-addons
-# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2012-11-27 14:18+0000\n"
-"Last-Translator: 盈通 ccdos <ccdos@intoerp.com>\n"
-"Language-Team: Chinese (Simplified) <zh_CN@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "添加/删除快捷方式..."
diff --git a/addons/web_shortcuts/i18n/zh_TW.po b/addons/web_shortcuts/i18n/zh_TW.po
deleted file mode 100644
index b7c58ae4c93..00000000000
--- a/addons/web_shortcuts/i18n/zh_TW.po
+++ /dev/null
@@ -1,25 +0,0 @@
-# Chinese (Traditional) translation for openobject-addons
-# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
-# This file is distributed under the same license as the openobject-addons package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2012-12-21 17:06+0000\n"
-"PO-Revision-Date: 2013-01-31 03:39+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: Chinese (Traditional) <zh_TW@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-09-12 06:37+0000\n"
-"X-Generator: Launchpad (build 16761)\n"
-
-#. module: web_shortcuts
-#. openerp-web
-#: code:addons/web_shortcuts/static/src/xml/web_shortcuts.xml:21
-#, python-format
-msgid "Add / Remove Shortcut..."
-msgstr "新增/移除 捷徑..."
diff --git a/addons/web_shortcuts/static/description/icon.png b/addons/web_shortcuts/static/description/icon.png
deleted file mode 100644
index 44347e95f45..00000000000
--- a/addons/web_shortcuts/static/description/icon.png
+++ /dev/null
diff --git a/addons/web_shortcuts/static/src/css/web_shortcuts.css b/addons/web_shortcuts/static/src/css/web_shortcuts.css
deleted file mode 100644
index 5d4e34f53b9..00000000000
--- a/addons/web_shortcuts/static/src/css/web_shortcuts.css
+++ /dev/null
@@ -1,60 +0,0 @@
-/* Shortcuts*/
-.oe_systray_shortcuts .oe_star_off {
-    color: #eee;
-}
-.oe_shortcuts_toggle {
-    height: 20px;
-    margin-top: 3px;
-    padding: 0;
-    width: 24px;
-    cursor: pointer;
-    display: block;
-    background: url(/web/static/src/img/add-shortcut.png) no-repeat center center;
-    float: left;
-}
-.oe_shortcuts_remove{
-    background: url(/web/static/src/img/remove-shortcut.png) no-repeat center center;
-}
-.oe_shortcuts {
-    position: absolute;
-    margin: 0;
-    padding: 6px 15px;
-    top: 37px;
-    left: 197px;
-    right: 0;
-    height: 17px;
-    line-height: 1.2;
-}
-.oe_shortcuts ul {
-    display: block;
-    overflow: hidden;
-    list-style: none;
-    white-space: nowrap;
-    padding: 0;
-    margin: 0;
-}
-.oe_shortcuts li {
-    cursor: pointer;
-    display: -moz-inline-stack;
-    display: inline-block;
-    display: inline; /*IE7 */
-    color: #fff;
-    text-align: center;
-    border-left: 1px solid #909090;
-    padding: 0 4px;
-    font-size: 80%;
-    font-weight: normal;
-    vertical-align: top;
-}
-
-.oe_shortcuts li:hover {
-    background-color: #666;
-}
-.oe_shortcuts li:first-child {
-    border-left: none;
-    padding-left: 0;
-}
-.oe_systray_shortcuts_items > li > a:hover {
-    overflow:visible;
-    white-space: normal;
-}
\ No newline at end of file
diff --git a/addons/web_shortcuts/static/src/js/web_shortcuts.js b/addons/web_shortcuts/static/src/js/web_shortcuts.js
deleted file mode 100644
index 045bc5b5ae6..00000000000
--- a/addons/web_shortcuts/static/src/js/web_shortcuts.js
+++ /dev/null
@@ -1,149 +0,0 @@
-/*############################################################################
-#
-#    OpenERP, Open Source Management Solution
-#    Copyright (C) 2011-2012 OpenERP SA (<http://openerp.com>).
-#
-#    This program is free software: you can redistribute it and/or modify
-#    it under the terms of the GNU Affero General Public License as
-#    published by the Free Software Foundation, either version 3 of the
-#    License, or (at your option) any later version.
-#
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU Affero General Public License for more details.
-#
-#    You should have received a copy of the GNU Affero General Public License
-#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#
-############################################################################*/
-
-openerp.web_shortcuts = function (instance) {
-
-var QWeb = instance.web.qweb,
-    _t = instance.web._t;
-
-instance.web_shortcuts.Shortcuts = instance.web.Widget.extend({
-    template: 'Systray.Shortcuts',
-
-    init: function() {
-        this._super();
-        this.on('load', this, this.load);
-        this.on('add', this, this.add);
-        this.on('display', this, this.display);
-        this.on('remove', this, this.remove);
-        this.on('click', this, this.click);
-        this.model = new instance.web.Model('ir.ui.view_sc');
-    },
-    start: function() {
-        var self = this;
-        this._super();
-        this.trigger('load');
-        this.$el.on('click', '.oe_systray_shortcuts_items a', function() {
-            self.trigger('click', $(this));
-        });
-    },
-    load: function() {
-        var self = this;
-        this.$el.find('.oe_systray_shortcuts_items').empty();
-        return this.model.call('get_sc', [
-            instance.session.uid,
-            'ir.ui.menu',
-            instance.web.pyeval.eval('context', {})
-        ]).done(function(shortcuts) {
-            _.each(shortcuts, function(sc) {
-                self.trigger('display', sc);
-            });
-        });
-    },
-    add: function (sc) {
-        var self = this;
-        this.model.call('create', [sc]).then(function(out){
-            self.trigger('load');
-        });
-    },
-    display: function(sc) {
-        var self = this;
-        this.$el.find('.oe_systray_shortcuts_items').append();
-        var $sc = $(QWeb.render('Systray.Shortcuts.Item', {'shortcut': sc}));
-        $sc.appendTo(self.$el.find('.oe_systray_shortcuts_items'));
-    },
-    remove: function (menu_id) {
-        var menu_id = this.session.active_id;
-        var $shortcut = this.$el.find('.oe_systray_shortcuts_items li a[data-id=' + menu_id + ']');
-        var shortcut_id = $shortcut.data('shortcut-id');
-        $shortcut.remove();
-        this.model.call('unlink', [shortcut_id]);
-    },
-    click: function($link) {
-        var self = this,
-            id = $link.data('id');
-        self.session.active_id = id;
-        // TODO: Use do_action({menu_id: id, type: 'ir.actions.menu'})
-        self.rpc('/web/menu/action', {'menu_id': id}).done(function(ir_menu_data) {
-            if (ir_menu_data.action.length){
-                instance.webclient.on_menu_action({action_id: ir_menu_data.action[0][2].id});
-            }
-        });
-        this.$el.find('.oe_systray_shortcuts').trigger('mouseout');
-    },
-    has: function(menu_id) {
-        return !!this.$el.find('a[data-id=' + menu_id + ']').length;
-    }
-});
-
-instance.web.UserMenu.include({
-    do_update: function() {
-        var self = this;
-        this._super.apply(this, arguments);
-        this.update_promise.done(function() {
-            if (self.shortcuts) {
-                self.shortcuts.trigger('load');
-            } else {
-                self.shortcuts = new instance.web_shortcuts.Shortcuts(self);
-                self.shortcuts.appendTo(instance.webclient.$el.find('.oe_systray'));
-            }
-        });
-    },
-});
-
-instance.web.ViewManagerAction.include({
-    switch_mode: function (view_type, no_store) {
-        var self = this;
-        this._super.apply(this, arguments).done(function() {
-            self.shortcut_check(self.views[view_type]);
-        });
-    },
-    shortcut_check : function(view) {
-        var self = this;
-        var shortcuts_menu = instance.webclient.user_menu.shortcuts;
-        var grandparent = this.getParent() && this.getParent().getParent();
-        // display shortcuts if on the first view for the action
-        var $shortcut_toggle = this.$el.find('.oe_shortcuts_toggle');
-        if (!this.action.name ||
-                !(view.view_type === this.views_src[0].view_type
-                    && view.view_id === this.views_src[0].view_id)) {
-            $shortcut_toggle.hide();
-            return;
-        }
-        // Anonymous users don't have user_menu
-        if (shortcuts_menu) {
-            $shortcut_toggle.toggleClass('oe_shortcuts_remove', shortcuts_menu.has(self.session.active_id));
-            $shortcut_toggle.unbind("click").click(function() {
-                if ($shortcut_toggle.hasClass("oe_shortcuts_remove")) {
-                    shortcuts_menu.trigger('remove', self.session.active_id);
-                } else {
-                    shortcuts_menu.trigger('add', {
-                        'user_id': self.session.uid,
-                        'res_id': self.session.active_id,
-                        'resource': 'ir.ui.menu',
-                        'name': self.action.name
-                    });
-                }
-                $shortcut_toggle.toggleClass("oe_shortcuts_remove");
-            });
-        }
-    }
-});
-
-};
diff --git a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml b/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
deleted file mode 100644
index 0b9701f9f1a..00000000000
--- a/addons/web_shortcuts/static/src/xml/web_shortcuts.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- vim:fdl=1:
--->
-<templates id="template" xml:space="preserve">
-<t t-name="Systray.Shortcuts">
-    <div class="oe_systray_shortcuts oe_topbar_item oe_dropdown_toggle">
-        <span class="oe_e oe_star_off">7</span>
-        <ul class="oe_systray_shortcuts_items oe_dropdown_menu"/>
-    </div>
-</t>
-<t t-name="Systray.Shortcuts.Item">
-    <li>
-        <a href="#" t-att-data-id="shortcut.res_id" t-att-data-shortcut-id="shortcut.id">
-            <t t-esc="shortcut.name"/>
-        </a>
-    </li>
-</t>
-<t t-extend="ViewManagerAction">
-    <t t-jquery="h2.oe_view_title" t-operation="prepend">
-        <a t-if="widget.flags.display_title !== false" class="oe_shortcuts_toggle" title="Add / Remove Shortcut..."
-            href="javascript: void(0)"> </a>
-    </t>
-</t>
-</templates>
diff --git a/addons/website/static/src/css/editor.css b/addons/website/static/src/css/editor.css
index e08157124c5..5604c62af75 100644
--- a/addons/website/static/src/css/editor.css
+++ b/addons/website/static/src/css/editor.css
@@ -330,6 +330,7 @@ table.editorbar-panel td.selected {
   color: white;
   height: 48px;
   margin-bottom: 32px;
+  padding-top: 12px;
 }
 
 /* ---- SNIPPET MANIPULATOR ---- */
diff --git a/addons/website/static/src/css/editor.sass b/addons/website/static/src/css/editor.sass
index c8854b210ec..7b2800bd849 100644
--- a/addons/website/static/src/css/editor.sass
+++ b/addons/website/static/src/css/editor.sass
@@ -429,15 +429,6 @@ $highlighted_text_color: #ffffff
     .oe_seo_keyword
         padding: .2em .4em .2em .5em
         +border-radius(.4em)
-    .keyword-in-title
-        background-color: $in_title_color+pointer
-        color: $highlighted_text_color
-    .keyword-in-description
-        background-color: $in_description_color
-        color: $highlighted_text_color
-    .keyword-in-body
-        background-color: $in_body_color
-        color: $highlighted_text_color
 
 /* ---- ACE EDITOR ---- */
 
diff --git a/addons/website/static/src/js/website.seo.js b/addons/website/static/src/js/website.seo.js
index 3da7c1ed8f1..635b80bb192 100644
--- a/addons/website/static/src/js/website.seo.js
+++ b/addons/website/static/src/js/website.seo.js
@@ -17,13 +17,13 @@
 
     function analyzeKeyword(htmlPage, keyword) {
         return  htmlPage.isInTitle(keyword) ? {
-                    title: 'keyword-in-title',
+                    title: 'label label-primary',
                     description: "This keyword is used in the page title",
                 } : htmlPage.isInDescription(keyword) ? {
-                    title: 'keyword-in-description',
+                    title: 'label label-info',
                     description: "This keyword is used in the page description",
                 } : htmlPage.isInBody(keyword) ? {
-                    title: 'keyword-in-body',
+                    title: 'label label-info',
                     description: "This keyword is used in the page content."
                 } : { title: "", description: "" };
     }
@@ -58,7 +58,7 @@
     });
 
     website.seo.SuggestionList = openerp.Widget.extend({
-        template: 'website.seo_list',
+        template: 'website.seo_suggestion_list',
         init: function (parent, options) {
             this.root = options.root;
             this.htmlPage = options.page;
@@ -155,7 +155,9 @@
                 });
             } else {
                 var companyName = self.htmlPage.company().toLowerCase();
-                self.add(companyName);
+                if (companyName != 'yourcompany') {
+                    self.add(companyName);
+                }
             }
         },
         keywords: function () {
@@ -361,24 +363,19 @@
                 }).appendTo(self.$('.js_seo_tips'));
             }
             var htmlPage = this.htmlPage;
-            if (htmlPage.headers('h1').length === 0) {
-                tips.push({
-                    type: 'warning',
-                    message: "This page seems to be missing an &lt;h1&gt; tag.",
-                });
-            }
-            if (htmlPage.headers('h1').length > 1) {
-                tips.push({
-                    type: 'warning',
-                    message: "The page contains more than one &lt;h1&gt; tag.",
-                });
-            }
+
+            // desactivated as too complex for end-users
+            // if (htmlPage.headers('h1').length === 0) {
+            //     tips.push({
+            //         type: 'warning',
+            //         message: "This page seems to be missing a title.",
+            //     });
+            // }
+
             if (tips.length > 0) {
                 _.each(tips, function (tip) {
                     displayTip(tip.message, tip.type);
                 });
-            } else {
-                displayTip("The markup on this page is appropriate for search engines.", 'success');
             }
         },
         confirmKeyword: function (e) {
diff --git a/addons/website/static/src/xml/website.seo.xml b/addons/website/static/src/xml/website.seo.xml
index 4630e1f294b..96a38a75d32 100644
--- a/addons/website/static/src/xml/website.seo.xml
+++ b/addons/website/static/src/xml/website.seo.xml
@@ -6,16 +6,18 @@
                 <div class="modal-content">
                     <div class="modal-header">
                         <button title="Close" type="button" class="close" data-dismiss="modal">×</button>
-                        <h3 class="modal-title js_seo_page_url"></h3>
-                        <h4 class="text-muted">Get this page efficiently referenced in Google to attract more visitors.</h4>
+                        <div class="h2">Promote This Page</div>
+                        <div class="text-muted">
+                            Get this page efficiently referenced in Google to attract more visitors.
+                        </div>
                     </div>
                     <div class="modal-body">
                         <div class="js_seo_tips" />
                         <section class="js_seo_keywords_list">
-                            <h3 class="page-header">1. Define keywords <small>describing your page content</small></h3>
+                            <h3 class="page-header mt16">1. Define Keywords <small>describing your page content</small></h3>
                             <div class="form-horizontal" role="form">
                                 <div class="form-group">
-                                    <label for="seo_page_keywords" class="col-lg-2 control-label">New keyword</label>
+                                    <label for="seo_page_keywords" class="col-lg-2 control-label">Add keywords:</label>
                                     <div class="col-lg-4">
                                         <div class="input-group">
                                           <input type="text" name="seo_page_keywords" class="form-control" maxlength="30"/>
@@ -26,12 +28,12 @@
                                     </div>
                                 </div>
                             </div>
-                            <span class="text-muted">Most searched topics related your keywords, ordered by importance:</span>
+                            <span class="text-muted">Most searched topics related to your keywords, ordered by importance:</span>
                             <!-- filled in JS -->
                         </section>
                         <section>
-                            <h3 class="page-header">2. Choose a title and description <small>containing keywords relevant to what people are searching on the web</small></h3>
-                            <div class="form-horizontal" role="form">
+                            <h3 class="page-header">2. Reference Your Page <small>using above suggestions</small></h3>
+                            <div class="form-horizontal mt16" role="form">
                                 <div class="form-group">
                                     <label for="seo_page_title" class="col-lg-2 control-label">Title</label>
                                     <div class="col-lg-8">
@@ -52,22 +54,27 @@
                                 <!-- filled in JS -->
                             </div>
                         </section>
-                        <hr/>
-                        <section>
-                            <button type="button" data-action="update" class="btn btn-primary">Apply changes</button> or <a data-action="discard" data-dismiss="modal" href="#">Discard</a>
-                        </section>
+                    </div><div class="modal-footer">
+                        <button data-action="discard" data-dismiss="modal" href="#" class="btn btn-default">Discard</button>
+                        <button type="button" data-action="update" class="btn btn-primary">Apply Changes</button>
                     </div>
                 </div>
             </div>
         </div>
     </t>
 
-    <t t-name="website.seo_list">
-        <ul class="list-inline">
+    <t t-name="website.seo_suggestion_list">
+        <ul class="list-inline mb0">
             <!-- filled in JS -->
         </ul>
     </t>
 
+    <t t-name="website.seo_list">
+        <div>
+            <!-- filled in JS -->
+        </div>
+    </t>
+
     <t t-name="website.seo_tip">
         <div t-attf-class="alert alert-#{ widget.type }">
             <t t-raw="widget.message"/>
@@ -75,7 +82,7 @@
     </t>
 
     <t t-name="website.seo_keyword">
-        <dl class="dl-horizontal">
+        <dl class="dl-horizontal mt8 mb8">
             <dt>
                 <span t-attf-title="#{ widget.tooltip() }" t-attf-class="oe_seo_keyword #{ widget.highlight() } js_seo_keyword" t-att-data-keyword="widget.keyword">
                     <a href="#" class="oe_remove" data-action="remove-keyword">x</a> <t t-raw="widget.keyword"/>
diff --git a/addons/website/static/src/xml/website.snippets.xml b/addons/website/static/src/xml/website.snippets.xml
index 38e3b82529d..e5dde368154 100644
--- a/addons/website/static/src/xml/website.snippets.xml
+++ b/addons/website/static/src/xml/website.snippets.xml
@@ -40,7 +40,7 @@
                             OpenERP shows you a preview of the building block
                             in the page.  You must release the block when the
                             preview is visible.
-                        </p>
+                        </div>
                     </div>
                     <div class="modal-footer">
                         <button type="button" class="btn btn-primary" data-dismiss="modal">Close</button>
diff --git a/addons/website/views/snippets.xml b/addons/website/views/snippets.xml
index 72a862c722e..1a79d52d5cc 100644
--- a/addons/website/views/snippets.xml
+++ b/addons/website/views/snippets.xml
@@ -6,7 +6,7 @@
     <ul class="nav navbar-nav nav-tabs">
       <li class="active"><a href="#snippet_structure" data-toggle="tab">Structure</a></li>
       <li><a href="#snippet_content" data-toggle="tab">Content</a></li>
-      <li><a href="#snippet_business" data-toggle="tab">Business</a></li>
+      <li><a href="#snippet_feature" data-toggle="tab">Features</a></li>
       <li><a href="#snippet_effect" data-toggle="tab">Effects</a></li>
     </ul>
     <div class="tab-content">
@@ -40,6 +40,7 @@
                 <li data-value="/website/static/src/img/banner/velour.jpg"><a>Velour</a></li>
                 <li data-value="/website/static/src/img/banner/wood.jpg"><a>Wood</a></li>
                 <li data-value="/website/static/src/img/banner/yellow_green.jpg"><a>Yellow Green</a></li>
+                <li class="divider"></li>
                 <li class="oe_custom_bg"><a><b>Chose your picture</b></a></li>
             </ul>
         </li>
@@ -67,8 +68,8 @@
                 <div class="item image_text active" style="background-image: url('/website/static/src/img/banner/color_splash.jpg')">
                     <div class="container" contenteditable="true">
                         <div class="carousel-caption content">
-                            <h2>Set Your Banner Title</h2>
-                            <h3>Customize with the top-left menu</h3>
+                            <h2>Your Banner Title</h2>
+                            <h3>Click to customize this text</h3>
                             <p>
                                 <a href="/page/website.contactus" class="btn btn-success btn-large">Contact us</a>
                             </p>
@@ -94,17 +95,14 @@
             <div class="container">
                 <div class="row">
                     <div class="col-md-6 mt32">
-                        <h3>Enterprise Social Network</h3>
+                        <h3>A Section Subtitle</h3>
                         <p>
-                            Make every employee feel more connected and engaged
-                            with twitter-like features for your own company. Follow
-                            people, share best practices, 'like' top ideas, etc.
+                            Write one or two paragraphs describing your product or
+                            services. To be successful your content needs to be
+                            useful to your readers.
                         </p><p>
-                            Connect with experts, follow what interests you, share
-                            documents and promote best practices with OpenERP
-                            Social application. Get work done with effective
-                            collaboration across departments, geographies
-                            and business applications.
+                            Start with the customer – find out what they want
+                            and give it to them.
                         </p>
                     </div>
                     <div class="col-md-6 mt16 mb16">
@@ -128,16 +126,14 @@
                         <img class="img-responsive shadow" src="/website/static/src/img/image_text.jpg"/>
                     </div>
                     <div class="col-md-6 mt32">
-                        <h3>Manage Your Shops</h3>
+                        <h3>A Section Subtitle</h3>
                         <p>
-                            OpenERP's Point of Sale introduces a super clean
-                            interface with no installation required that runs
-                            online and offline on modern hardwares.
+                            Write one or two paragraphs describing your product,
+                            services or a specific feature. To be successful
+                            your content needs to be useful to your readers.
                         </p><p>
-                            It's full integration with the company inventory
-                            and accounting, gives you real time statistics and
-                            consolidations amongst all shops without the hassle
-                            of integrating several applications.
+                            Start with the customer – find out what they want
+                            and give it to them.
                         </p>
                     </div>
                 </div>
@@ -155,7 +151,7 @@
             <div class="container">
                 <h1>Sell Online. Easily.</h1>
                 <p>
-                    Get your online shop ready in a few clicks with OpenERP Commerce.
+                    Write one sentence to convince visitor about your message.
                 </p>
                 <p>
                     <a class="btn btn-primary btn-lg" href="/website.contactus">
@@ -177,23 +173,26 @@
                 <div class="row">
                     <div class="col-md-12 text-center mt16 mb32">
                         <h2>
-                            OpenERP Project Management
+                            A Great Headline
                         </h2>
-                        <h3 class="text-muted">Infinitely flexible. Incredibly easy to use.</h3>
+                        <h3 class="text-muted">A good subtitle. A very good one.</h3>
                     </div>
                     <div class="col-md-12 mb16 mt16">
                         <p>
-                            OpenERP's <b>collaborative and realtime</b> project
-                            management helps your team get work done. Keep
-                            track of everything, from the big picture to the
-                            minute details, from the customer contract to the
-                            billing.
+                            A great way to catch reader's attention is to tell a story.
+                            Everything you consider writing can be told as a story.
                         </p><p>
-                            Organize projects around <b>your own processes</b>. Work
-                            on tasks and issues using the kanban view, schedule
-                            tasks using the gantt chart and control deadlines
-                            in the calendar view. Every project may have it's
-                            own stages allowing teams to optimize their job.
+                            <b>Great stories have personality</b>. Personality
+                            connected to your person. This shows up in small
+                            quirks like word choices or phrases. Write as you
+                            write, not as someone else would write.
+                        </p><p>
+                            <b>Great stories are for everyone when written for
+                            just one</b>. If you try to write with a wide general
+                            audience in mind, your story will ring false. It
+                            will be bland. No one will be interested. Write for
+                            one person. If it’s genuine for the one, it’s
+                            genuine for the rest.
                         </p>
                     </div>
                 </div>
@@ -212,7 +211,7 @@
                 <div class="row">
                     <div class="col-md-12">
                         <h1 class="text-center">Your Website Title</h1>
-                        <h3 class="text-muted text-center">Great products for great people</h3>
+                        <h3 class="text-muted text-center">Ans a great subtitle too</h3>
                     </div>
                 </div>
             </div>
@@ -238,23 +237,22 @@
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 text-center mt32 mb32">
-                        <h2>Work with the hardware you already have...</h2>
+                        <h2>A Punchy Headline</h2>
                     </div>
                     <div class="col-md-12">
                         <img class="img-responsive" src="/website/static/src/img/big_picture.png" style="margin: 0 auto;"/>
                     </div>
                     <div class="col-md-6 col-md-offset-3 mb16 mt16">
                         <p class="text-center">
-                            <b>No installation required</b>
+                            <b>A Small Subtitle</b>
                         </p>
                         <p class="text-center">
-                            OpenERP's Point of Sale introduces a super clean
-                            interface with no installation required that runs
-                            online and offline on modern hardware. Laptops,
-                            tablets, industrial POS, it runs on everything.
+                            Choose a vibrant image and write an inspiring paragraph
+                            about it. It does not have to be long, but it should
+                            reinforce your image.
                         </p>
                         <p class="text-center">
-                            <a href="/page/website.contactus">Get more information »</a>
+                            <a href="/page/website.contactus">Contact us »</a>
                         </p>
                     </div>
                 </div>
@@ -272,8 +270,8 @@
             <div class="container">
                 <div class="row">
                     <div class="col-md-12 text-center mt16 mb16">
-                        <h2>OpenERP HR Features</h2>
-                        <h3 class="text-muted">Manage your company most important asset: People</h3>
+                        <h2>A Great Title</h2>
+                        <h3 class="text-muted">And a good subtitle</h3>
                     </div>
                     <div class="col-md-4">
                         <img class="img-rounded img-responsive" src="/website/static/src/img/china_thumb.jpg"/>
@@ -325,9 +323,8 @@
             <span class="oe_snippet_thumbnail_title">Well</span>
         </div>
         <div class="oe_snippet_body well">
-            Manage your sales funnel with no effort with OpenERP CRM. Attract
-            leads, follow-up on phone calls and meetings. Analyse the quality
-            of your leads to make informed decisions.
+            Explain the benefit you offer. Don't write about products or
+            services here, write about solutions.
         </div>
     </div>
 
@@ -339,10 +336,10 @@
         </div>
         <blockquote class="oe_snippet_body">
             <p>
-                OpenERP provides essential platform for our project management.
-                Things are better organized and more visible with it.
+                Write here a quote from one of your customer. Quotes are are
+                great way to give confidence in your products or services.
             </p>
-            <small>John Doe, CEO</small>
+            <small>Author of this quote</small>
         </blockquote>
     </div>
 
@@ -354,13 +351,12 @@
         </div>
         <div class="oe_snippet_body panel panel-default">
             <div class="panel-heading">
-                <h3 class="panel-title">OpenERP Features</h3>
+                <h3 class="panel-title">Feature Title</h3>
             </div>
             <div class="panel-body">
-                OpenERP's collaborative and realtime project management helps
-                your team get work done. Keep track of everything, from the big
-                picture to the minute details, from the customer contract to
-                the billing.
+                Panels are great to compare offers or to emphasize on
+                key features. To compare products, use panels inside
+                columns.
             </div>
         </div>
     </div>
@@ -376,7 +372,7 @@
 
 </div>
 
-<div id="snippet_business" class="tab-pane fade">
+<div id="snippet_feature" class="tab-pane fade">
 
     <div data-snippet-id="portfolio" data-selector-children=".oe_structure, [data-oe-type=html]">
         <div class="oe_snippet_thumbnail">
@@ -643,10 +639,10 @@
                     <div class="col-md-4 col-md-offset-1 mt16 mb32">
                         <blockquote data-snippet-id="quote">
                             <p>
-                                OpenERP provides essential platform for our project management.
-                                Things are better organized and more visible with it.
+                                Write here a quote from one of your customer. Quotes are are
+                                great way to give confidence in your products or services.
                             </p>
-                            <small>John Doe, CEO</small>
+                            <small>Author of this quote</small>
                         </blockquote>
                     </div>
                     <div class="col-md-4 col-md-offset-2 mt16 mb32">
@@ -713,10 +709,10 @@
                 <div class="row">
                     <div class="col-md-12 mt128 mb32">
                         <h1 class="text-center">
-                            <b>OpenERP Events Management</b>
+                            <b>A Great Title</b>
                         </h1>
                         <h3 class="text-center">
-                            Sell tickets online with the Event app
+                            And a motivating subtitle
                         </h3>
                     </div>
                 </div>
diff --git a/addons/website/views/views.xml b/addons/website/views/views.xml
index e09d854321c..0e8dbf422d9 100644
--- a/addons/website/views/views.xml
+++ b/addons/website/views/views.xml
@@ -133,19 +133,17 @@
                                         <div class="col-md-5 col-lg-offset-1" name="about_us">
                                             <h4>
                                                 <span t-field="res_company.name">Your Company</span>
-                                                <small> - <a t-href="/page/website.aboutus">About us</a></small>
+                                                <small> - <a href="/page/website.aboutus">About us</a></small>
                                             </h4>
-                                            <span> <!-- fix me: not ediatable the editable render in chrome is wrong -->
-                                                <p>
-                                                    We are a team of passionated people whose goal is to improve everyone's
-                                                    life through disruptive products. We build great products to solve your
-                                                    business problems.
-                                                </p>
-                                                <p>
-                                                    Our products are designed for small to medium companies willing to optimize
-                                                    their performance.
-                                                </p>
-                                            </span>
+                                            <p>
+                                                We are a team of passionated people whose goal is to improve everyone's
+                                                life through disruptive products. We build great products to solve your
+                                                business problems.
+                                            </p>
+                                            <p>
+                                                Our products are designed for small to medium companies willing to optimize
+                                                their performance.
+                                            </p>
                                         </div>
                                     </div>
                                 </div>
diff --git a/addons/website_blog/static/description/analytics.png b/addons/website_blog/static/description/analytics.png
new file mode 100644
index 00000000000..f7eba2dd525
--- /dev/null
+++ b/addons/website_blog/static/description/analytics.png
diff --git a/addons/website_blog/static/description/blog_cover.png b/addons/website_blog/static/description/blog_cover.png
new file mode 100644
index 00000000000..59cc59bb57b
--- /dev/null
+++ b/addons/website_blog/static/description/blog_cover.png
diff --git a/addons/website_blog/static/description/blog_create.png b/addons/website_blog/static/description/blog_create.png
new file mode 100644
index 00000000000..6d309581626
--- /dev/null
+++ b/addons/website_blog/static/description/blog_create.png
diff --git a/addons/website_blog/static/description/icon.png b/addons/website_blog/static/description/icon.png
new file mode 100644
index 00000000000..080f5859833
--- /dev/null
+++ b/addons/website_blog/static/description/icon.png
diff --git a/addons/website_blog/static/description/index.html b/addons/website_blog/static/description/index.html
index 9f9b8c47226..8299000d901 100644
--- a/addons/website_blog/static/description/index.html
+++ b/addons/website_blog/static/description/index.html
@@ -7,7 +7,7 @@
         <div class="oe_span6">
             <div class="oe_demo oe_picture oe_screenshot">
                 <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=website_mail">
-                    <img src="">
+                    <img src="blog_cover.png">
                 </a>
                 <div class="oe_demo_footer oe_centeralign">Online Demo</div>
             </div>
@@ -15,9 +15,12 @@
         <div class="oe_span6">
             <p class='oe_mt32'>
 				Express yourself with the OpenERP enterprise grade blogging
-				plateform.  Write beautiful blog posts, engage with visitors,
+				plateform. Write beautiful blog posts, engage with visitors,
 				translate content and moderate social streams.
-            </p>
+            </p><p>
+				Get your blog posts efficiently referenced in Google and
+				translated in mutiple languages in just a few clicks.
+			</p>
             <div class="oe_centeralign oe_websiteonly">
                 <a href="http://www.openerp.com/start?app=website_sale" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> online store</a>
             </div>
@@ -42,7 +45,7 @@
         </div>
         <div class="oe_span6">
             <div class="oe_bg_img oe_centered">
-                <img class="oe_picture" src="">
+                <img class="oe_picture oe_screenshot" src="website_edit.png">
             </div>
         </div>
     </div>
@@ -54,7 +57,7 @@
         <h3 class="oe_slogan">Reach multi-languages audiences without Pain</h3>
         <div class="oe_span6">
             <div class="oe_bg_img">
-                <img class="oe_picture" src="">
+                <img class="oe_picture" src="openerp_translation_tool.png">
             </div>
         </div>
         <div class="oe_span6">
@@ -85,7 +88,7 @@
         </div>
         <div class="oe_span6">
             <div class="oe_bg_img">
-                <img class="oe_picture oe_screenshot" src="">
+                <img class="oe_picture oe_screenshot" src="openerp_chat.png">
             </div>
         </div>
     </div>
@@ -96,7 +99,7 @@
         <h2 class="oe_slogan">Build Visitors Loyalty</h2>
         <h3 class="oe_slogan">Social Media Integration and Easy Following</h3>
         <div class="oe_span6">
-            <img class="oe_picture oe_screenshot" src="">
+            <img class="oe_picture oe_screenshot" src="social.png">
         </div>
         <div class="oe_span6">
            <p class='oe_mt32'>
@@ -124,41 +127,18 @@
           </p>
         </div>
         <div class="oe_span6">
-            <img class="oe_picture oe_screenshot" src="">
+            <img class="oe_picture oe_screenshot" src="analytics.png">
         </div>
    </div>
 </section>
 
-<section class="oe_container oe_dark">
-    <div class="oe_row">
-        <h2 class="oe_slogan">Designer-Friendly Themes</h2>
-        <h3 class="oe_slogan">Designers love working on OpenERP</h3>
-        <div class="oe_span6">
-          <p class='oe_mt32'>
-              Themes are awesome and easy to design. You don't need to develop
-              to create new pages, themes or building blocks. We use a clean
-              HTML structure, a <a href="http://getbootstrap.com/">bootstrap</a>
-              CSS and our modularity allows to distribute your themes easily.
-          </p><p>
-              The building block approach allows the website to remain clean
-              after the end-users start creating new contents.
-          </p>
-        </div>
-        <div class="oe_span6">
-            <div class="oe_row_img oe_centered">
-                <img class="oe_picture" src="">
-            </div>
-        </div>
-    </div>
-</section>
-
 <section class="oe_container">
     <div class="oe_row">
         <h2 class="oe_slogan">SEO Optimized Blog Posts</h2>
         <h3 class="oe_slogan">Attract new visitors with a good referencing</h3>
         <div class="oe_span6">
             <div class="oe_bg_img">
-                <img class="oe_picture oe_screenshot" src="">
+                <img class="oe_picture oe_screenshot" src="website_seo.png">
             </div>
         </div>
         <div class="oe_span6">
@@ -176,13 +156,35 @@
     </div>
 </section>
 
+<section class="oe_container oe_dark">
+    <div class="oe_row">
+        <h2 class="oe_slogan">Designer-Friendly Themes</h2>
+        <h3 class="oe_slogan">Designers love working on OpenERP</h3>
+        <div class="oe_span6">
+          <p class='oe_mt32'>
+              Themes are awesome and easy to design. You don't need to develop
+              to create new pages, themes or building blocks. We use a clean
+              HTML structure, a <a href="http://getbootstrap.com/">bootstrap</a>
+              CSS and our modularity allows to distribute your themes easily.
+          </p><p>
+              The building block approach allows the website to remain clean
+              after the end-users start creating new contents.
+          </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="website_theme.png">
+            </div>
+        </div>
+    </div>
+</section>
 <section class="oe_container">
     <div class="oe_row">
         <h2 class="oe_slogan">Easy Access Rights</h2>
         <h3 class="oe_slogan">Adapt your publishing process to your own need</h3>
         <div class="oe_span6">
             <div class="oe_bg_img">
-                <img class="oe_picture oe_screenshot" src="">
+                <img class="oe_picture oe_screenshot" src="blog_create.png">
             </div>
         </div>
         <div class="oe_span6">
@@ -202,33 +204,13 @@
 
 <section class="oe_container oe_dark">
     <div class="oe_row">
-        <h2 class="oe_slogan">Built-in Comments</h2>
-        <h3 class="oe_slogan">Engage with your readers</h3>
-        <div class="oe_span6">
-            <p class='oe_mt32'>
-                Your blog is your home, and comments provide a space for your
-                friends and followers to engage with your content. OpenERP's
-                comment tools give you everything you need to be a forum for
-                discussion and to moderate that discussion.
-            </p>
-        </div>
-        <div class="oe_span6">
-            <div class="oe_bg_img oe_centered">
-                <img class="oe_picture" src="">
-            </div>
-        </div>
-    </div>
-</section>
-
-<section class="oe_container">
-    <div class="oe_row">
         <h2 class="oe_slogan">Integrated With Others OpenERP Apps</h2>
         <h3 class="oe_slogan">Get hundreds of open source apps for free</h3>
         <div class="oe_span4">
             <a href="/apps/website">
                 <h3>CMS</h3>
                 <div class="oe_row_img oe_centered">
-                    <img class="oe_picture oe_screenshot" src="">
+                    <img class="oe_picture oe_screenshot" src="website_cms.png">
                 </div>
             </a>
             <p>
@@ -239,7 +221,7 @@
             <a href="/apps/website_sale">
                 <h3>eCommerce</h3>
                 <div class="oe_row_img oe_centered">
-                    <img class="oe_picture oe_screenshot" src="">
+                    <img class="oe_picture oe_screenshot" src="website_sale.png">
                 </div>
             </a>
             <p>
@@ -250,7 +232,7 @@
             <a href="/apps/website_event">
                 <h3>Online Events</h3>
                 <div class="oe_row_img oe_centered">
-                    <img class="oe_picture oe_screenshot" src="">
+                    <img class="oe_picture oe_screenshot" src="website_event.png">
                 </div>
             </a>
             <p>
@@ -258,11 +240,6 @@
                 webinars, trainings, etc.
             </p>
         </div>
-        <div class="oe_span12 oe_centered oe_muted">
-            <a href="/apps">
-                and hundreds more applications...
-            </a>
-        </div>
     </div>
 </section>
 
diff --git a/addons/website_blog/static/description/openerp_chat.png b/addons/website_blog/static/description/openerp_chat.png
new file mode 100644
index 00000000000..c37ab28ac03
--- /dev/null
+++ b/addons/website_blog/static/description/openerp_chat.png
diff --git a/addons/website_blog/static/description/openerp_translation_tool.png b/addons/website_blog/static/description/openerp_translation_tool.png
new file mode 100644
index 00000000000..f322e73e54e
--- /dev/null
+++ b/addons/website_blog/static/description/openerp_translation_tool.png
diff --git a/addons/website_blog/static/description/social.png b/addons/website_blog/static/description/social.png
new file mode 100644
index 00000000000..4d2615ee36a
--- /dev/null
+++ b/addons/website_blog/static/description/social.png
diff --git a/addons/website_blog/static/description/website_cms.png b/addons/website_blog/static/description/website_cms.png
new file mode 100644
index 00000000000..5d9f8634574
--- /dev/null
+++ b/addons/website_blog/static/description/website_cms.png
diff --git a/addons/website_blog/static/description/website_edit.png b/addons/website_blog/static/description/website_edit.png
new file mode 100644
index 00000000000..c199d1f40d8
--- /dev/null
+++ b/addons/website_blog/static/description/website_edit.png
diff --git a/addons/website_blog/static/description/website_event.png b/addons/website_blog/static/description/website_event.png
new file mode 100644
index 00000000000..62cff4396ec
--- /dev/null
+++ b/addons/website_blog/static/description/website_event.png
diff --git a/addons/website_blog/static/description/website_sale.png b/addons/website_blog/static/description/website_sale.png
new file mode 100644
index 00000000000..197ddf09b78
--- /dev/null
+++ b/addons/website_blog/static/description/website_sale.png
diff --git a/addons/website_blog/static/description/website_seo.png b/addons/website_blog/static/description/website_seo.png
new file mode 100644
index 00000000000..7cb74e19878
--- /dev/null
+++ b/addons/website_blog/static/description/website_seo.png
diff --git a/addons/website_blog/static/description/website_theme.png b/addons/website_blog/static/description/website_theme.png
new file mode 100644
index 00000000000..a5955b29a60
--- /dev/null
+++ b/addons/website_blog/static/description/website_theme.png
diff --git a/addons/website_crm/static/description/contact.png b/addons/website_crm/static/description/contact.png
new file mode 100644
index 00000000000..353ca2cdd83
--- /dev/null
+++ b/addons/website_crm/static/description/contact.png
diff --git a/addons/website_crm/static/description/email.png b/addons/website_crm/static/description/email.png
new file mode 100644
index 00000000000..3cca87cbab3
--- /dev/null
+++ b/addons/website_crm/static/description/email.png
diff --git a/addons/website_crm/static/description/icon.png b/addons/website_crm/static/description/icon.png
new file mode 100644
index 00000000000..74eebc89cfd
--- /dev/null
+++ b/addons/website_crm/static/description/icon.png
diff --git a/addons/website_crm/static/description/index.html b/addons/website_crm/static/description/index.html
index 9a132bb4e23..864297ea1c1 100644
--- a/addons/website_crm/static/description/index.html
+++ b/addons/website_crm/static/description/index.html
@@ -7,7 +7,7 @@
         <div class="oe_span6">
             <div class="oe_demo oe_picture oe_screenshot">
                 <a href="https://www.openerp.com/saas_master/demo?lang=en_US&module=website">
-                    <img src="">
+                    <img src="contact.png">
                 </a>
                 <div class="oe_demo_footer oe_centeralign">Online Demo</div>
             </div>
@@ -38,7 +38,7 @@
         </div>
         <div class="oe_span6">
             <div class="oe_bg_img oe_centered">
-                <img class="oe_picture" src="">
+                <img class="oe_picture oe_screenshot" src="email.png">
             </div>
         </div>
     </div>
@@ -52,7 +52,7 @@
             <a href="/apps/website_sale">
                 <h3>eCommerce</h3>
                 <div class="oe_row_img oe_centered">
-                    <img class="oe_picture oe_screenshot" src="">
+                    <img class="oe_picture oe_screenshot" src="website_sale.png">
                 </div>
             </a>
             <p>
@@ -63,7 +63,7 @@
             <a href="/apps/website_mail">
                 <h3>Blogs</h3>
                 <div class="oe_row_img oe_centered">
-                    <img class="oe_picture oe_screenshot" src="">
+                    <img class="oe_picture oe_screenshot" src="website_event.png">
                 </div>
             </a>
             <p>
@@ -74,7 +74,7 @@
             <a href="/apps/website">
                 <h3>CMS</h3>
                 <div class="oe_row_img oe_centered">
-                    <img class="oe_picture oe_screenshot" src="">
+                    <img class="oe_picture oe_screenshot" src="website_cms.png">
                 </div>
             </a>
             <p>
diff --git a/addons/website_crm/static/description/website_cms.png b/addons/website_crm/static/description/website_cms.png
new file mode 100644
index 00000000000..5d9f8634574
--- /dev/null
+++ b/addons/website_crm/static/description/website_cms.png
diff --git a/addons/website_crm/static/description/website_event.png b/addons/website_crm/static/description/website_event.png
new file mode 100644
index 00000000000..62cff4396ec
--- /dev/null
+++ b/addons/website_crm/static/description/website_event.png
diff --git a/addons/website_crm/static/description/website_sale.png b/addons/website_crm/static/description/website_sale.png
new file mode 100644
index 00000000000..197ddf09b78
--- /dev/null
+++ b/addons/website_crm/static/description/website_sale.png
diff --git a/addons/website_google_map/__openerp__.py b/addons/website_google_map/__openerp__.py
index f1fed29227e..d7d188219af 100644
--- a/addons/website_google_map/__openerp__.py
+++ b/addons/website_google_map/__openerp__.py
@@ -1,6 +1,6 @@
 {
     'name': 'Website Google Map',
-    'category': 'Website',
+    'category': 'Hidden',
     'summary': '',
     'version': '1.0',
     'description': """
@@ -14,4 +14,5 @@ OpenERP Website Google Map
         'views/google_map.xml',
     ],
     'installable': True,
+    'auto_install': True,
 }
diff --git a/addons/website_mail/__openerp__.py b/addons/website_mail/__openerp__.py
index a4d3c146274..9c327ed518d 100644
--- a/addons/website_mail/__openerp__.py
+++ b/addons/website_mail/__openerp__.py
@@ -21,7 +21,7 @@
 
 {
     'name': 'Website Mail',
-    'category': 'Website',
+    'category': 'Hidden',
     'summary': 'Website Module for Mail',
     'version': '0.1',
     'description': """Glue module holding mail improvements for website.""",
diff --git a/addons/website_membership/__openerp__.py b/addons/website_membership/__openerp__.py
index 2d470cd6aa1..68147171ba2 100644
--- a/addons/website_membership/__openerp__.py
+++ b/addons/website_membership/__openerp__.py
@@ -1,5 +1,5 @@
 {
-    'name': 'Public Partners Members',
+    'name': 'Public Members',
     'category': 'Website',
     'summary': 'Publish Members',
     'version': '1.0',
diff --git a/addons/website_sale/static/description/icon.png b/addons/website_sale/static/description/icon.png
new file mode 100644
index 00000000000..d7b9f4f25bd
--- /dev/null
+++ b/addons/website_sale/static/description/icon.png
diff --git a/addons/website_sale/static/description/website_sale_product.png b/addons/website_sale/static/description/website_sale_product.png
index 197ddf09b78..7d0ff18bd78 100644
--- a/addons/website_sale/static/description/website_sale_product.png
+++ b/addons/website_sale/static/description/website_sale_product.png