diff --git a/.travis.yml b/.travis.yml
index 920422fe..dbe10d4c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+sudo: false
+cache: pip
+
 addons:
   apt:
     packages:
diff --git a/document_page/document_page.py b/document_page/document_page.py
index 57e6d050..21da2770 100644
--- a/document_page/document_page.py
+++ b/document_page/document_page.py
@@ -27,6 +27,7 @@ _logger = logging.getLogger(__name__)
 
 class document_page(models.Model):
     _name = "document.page"
+    _inherit = ['mail.thread']
     _description = "Document Page"
     _order = 'name'
 
diff --git a/document_page/document_page_view.xml b/document_page/document_page_view.xml
index abf2aea3..7f7ab50d 100644
--- a/document_page/document_page_view.xml
+++ b/document_page/document_page_view.xml
@@ -44,39 +44,58 @@
             <field name="name">document.page.form</field>
             <field name="model">document.page</field>
             <field name="arch" type="xml">
-                <form string="Document Page" version="7.0">
+                <form string="Document Page">
+                    <sheet>
+                        <field name="type" invisible="1"/>
+                        <h1><field name="name" placeholder="Name"/></h1>
+                        <group>
+                            <group>
+                                <field name="parent_id"
+                                       string="Category"
+                                       context="{'default_type':'category'}"/>
+                            </group>
+                            <group>
+                                <field name="write_uid"
+                                       groups="base.group_no_one"/>
+                                <field name="write_date"
+                                       groups="base.group_no_one"/>
+                                <field name="menu_id"
+                                       groups="base.group_no_one"/>
+                            </group>
+                        </group>
+                        <separator string="Content" class="oe_edit_only" />
+                        <field name="content"
+                               placeholder="e.g. Once upon a time..."
+                               class="oe_edit_only"
+                               widget="html" />
+                        <separator string="Last Content" />
+                        <div class="oe_document_page">
+                            <field name="display_content"
+                                   widget="html"
+                                   class="oe_view_only"
+                                   options='{"safe": True}' />
+                        </div>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_wiki_menu_form" model="ir.ui.view">
+            <field name="name">document.page.menu.form</field>
+            <field name="model">document.page</field>
+            <field name="arch" type="xml">
+                <form string="Document Page">
                     <field name="type" invisible="1"/>
                     <h1><field name="name" placeholder="Name"/></h1>
-                    <group class="oe_edit_only">
-                        <group>
-                            <field name="parent_id"
-                                   string="Category"
-                                   context="{'default_type':'category'}"/>
-                        </group>
-                        <group>
-                            <field name="write_uid"
-                                   groups="base.group_no_one"/>
-                            <field name="write_date"
-                                   groups="base.group_no_one"/>
-                            <field name="menu_id"
-                                   groups="base.group_no_one"/>
-                        </group>
-                    </group>
-
-                    <div class="oe_edit_only"
-                         attrs="{'invisible':[('type','=','content')]}">
-                        <label for="content" string="Template"/>
-                        that will be used as a content template for all new page of this category.
-                    </div>
-                    <field name="content"
-                           placeholder="e.g. Once upon a time..."
-                           class="oe_edit_only"
-                           widget="html" />
                     <div class="oe_document_page">
                         <field name="display_content"
-                               widget="html"
-                               class="oe_view_only"
-                               options='{"safe": True}' />
+                            widget="html"
+                            class="oe_view_only"
+                            options='{"safe": True}' />
                     </div>
                 </form>
             </field>
@@ -108,6 +127,70 @@
             </field>
         </record>
 
+        <!-- Category Views -->
+        <record id="view_category_form" model="ir.ui.view">
+            <field name="name">document.page.category.form</field>
+            <field name="model">document.page</field>
+            <field name="arch" type="xml">
+                <form string="Category">
+                    <sheet>
+                        <field name="type" invisible="1"/>
+                        <h1><field name="name" placeholder="Name"/></h1>
+                        <group>
+                            <group>
+                                <field name="parent_id" string="Category"
+                                    context="{'default_type':'category'}"/>
+                            </group>
+                            <group>
+                                <field name="write_uid"
+                                    groups="base.group_no_one"/>
+                                <field name="write_date"
+                                    groups="base.group_no_one"/>
+                                <field name="menu_id"
+                                    groups="base.group_no_one"/>
+                            </group>
+                        </group>
+                        <notebook>
+                            <page string="Template" name="template">
+                                <div>
+                                    <label for="content"
+                                        string="Template that will be used as a content template for all new page of this category."/>
+                                </div>
+                                <field name="content"
+                                       placeholder="e.g. Once upon a time..."
+                                       widget="html" />
+                            </page>
+                            <page string="Documents" name="documents">
+                                <div class="oe_document_page">
+                                    <field name="display_content"
+                                           widget="html"
+                                           class="oe_view_only"
+                                           options='{"safe": True}' />
+                                </div>
+                            </page>
+                        </notebook>
+                    </sheet>
+                    <div class="oe_chatter">
+                        <field name="message_follower_ids" widget="mail_followers"/>
+                        <field name="message_ids" widget="mail_thread"/>
+                    </div>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_category_tree" model="ir.ui.view">
+            <field name="name">document.page.category.tree</field>
+            <field name="model">document.page</field>
+            <field name="arch" type="xml">
+                <tree string="Categories">
+                    <field name="name"/>
+                    <field name="parent_id"/>
+                    <field name="create_uid" invisible="1"/>
+                    <field name="write_uid"/>
+                    <field name="write_date"/>
+                </tree>
+            </field>
+        </record>
 
         <!-- page action -->
         <record id="action_page" model="ir.actions.act_window">
@@ -125,7 +208,18 @@
               </p>
             </field>
         </record>
-
+        <record id="action_page_view_tree" model="ir.actions.act_window.view">
+            <field name="sequence" eval="0" />
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_wiki_tree"/>
+            <field name="act_window_id" ref="action_page"/>
+        </record>
+        <record id="action_page_view_form" model="ir.actions.act_window.view">
+            <field name="sequence" eval="5" />
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_wiki_form"/>
+            <field name="act_window_id" ref="action_page"/>
+        </record>
         <menuitem id="menu_page"
                   parent="menu_wiki"
                   name="Pages"
@@ -139,9 +233,21 @@
             <field name="context">{'default_type': 'category'}</field>
             <field name="view_type">form</field>
             <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="view_wiki_tree"/>
+            <field name="view_id" ref="view_category_tree"/>
             <field name="search_view_id" ref="view_wiki_filter"/>
         </record>
+        <record id="action_category_view_tree" model="ir.actions.act_window.view">
+            <field name="sequence" eval="0" />
+            <field name="view_mode">tree</field>
+            <field name="view_id" ref="view_category_tree"/>
+            <field name="act_window_id" ref="action_category"/>
+        </record>
+        <record id="action_category_view_form" model="ir.actions.act_window.view">
+            <field name="sequence" eval="5" />
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_category_form"/>
+            <field name="act_window_id" ref="action_category"/>
+        </record>
         <menuitem id="menu_category"
                   parent="menu_wiki"
                   name="Categories"
diff --git a/document_page/i18n/document_page.pot b/document_page/i18n/document_page.pot
index 8139bba8..4739dc9b 100644
--- a/document_page/i18n/document_page.pot
+++ b/document_page/i18n/document_page.pot
@@ -1,13 +1,13 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
 #	* document_page
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-08-14 00:10+0000\n"
-"PO-Revision-Date: 2014-08-14 00:10+0000\n"
+"POT-Creation-Date: 2015-07-27 20:33+0000\n"
+"PO-Revision-Date: 2015-07-27 20:33+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,213 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: document_page
-#: view:document.page:0
-#: field:document.page,parent_id:0
-#: selection:document.page,type:0
-#: model:ir.actions.act_window,name:document_page.action_category
-msgid "Category"
-msgstr ""
-
-#. module: document_page
-#: view:document.page:0
-#: field:document.page,write_uid:0
-msgid "Last Contributor"
-msgstr ""
-
-#. module: document_page
-#: view:document.page:0
-#: field:document.page,create_uid:0
-msgid "Author"
-msgstr ""
-
-#. module: document_page
-#: field:document.page,menu_id:0
-msgid "Menu"
-msgstr ""
-
-#. module: document_page
-#: view:document.page:0
-#: model:ir.model,name:document_page.model_document_page
-msgid "Document Page"
-msgstr ""
-
-#. module: document_page
-#: model:ir.actions.act_window,name:document_page.action_related_page_history
-msgid "Page History"
-msgstr ""
-
-#. module: document_page
-#: view:document.page:0
-#: field:document.page,content:0
-#: selection:document.page,type:0
-#: field:document.page.history,content:0
-msgid "Content"
-msgstr ""
-
-#. module: document_page
-#: view:document.page:0
-msgid "Group By..."
-msgstr ""
-
-#. module: document_page
-#: view:document.page:0
-msgid "Template"
-msgstr ""
-
-#. module: document_page
-#: view:document.page:0
-msgid "that will be used as a content template for all new page of this category."
-msgstr ""
-
-#. module: document_page
-#: field:document.page,name:0
-msgid "Title"
-msgstr ""
-
-#. module: document_page
-#: model:ir.model,name:document_page.model_document_page_create_menu
-msgid "Wizard Create Menu"
-msgstr ""
-
-#. module: document_page
-#: field:document.page,type:0
-msgid "Type"
-msgstr ""
-
-#. module: document_page
-#: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
-msgid "wizard.document.page.history.show_diff"
-msgstr ""
-
-#. module: document_page
-#: field:document.page.history,create_uid:0
-msgid "Modified By"
-msgstr ""
-
-#. module: document_page
-#: view:document.page.create.menu:0
-msgid "or"
-msgstr ""
-
-#. module: document_page
-#: help:document.page,type:0
-msgid "Page type"
-msgstr ""
-
-#. module: document_page
-#: view:document.page.create.menu:0
-msgid "Menu Information"
-msgstr ""
-
-#. module: document_page
-#: view:document.page.history:0
-#: model:ir.model,name:document_page.model_document_page_history
-msgid "Document Page History"
-msgstr ""
-
-#. module: document_page
-#: model:ir.ui.menu,name:document_page.menu_page_history
-msgid "Pages history"
-msgstr ""
-
-#. module: document_page
-#: code:addons/document_page/document_page.py:129
-#, python-format
-msgid "There are no changes in revisions."
-msgstr ""
-
-#. module: document_page
-#: field:document.page.history,create_date:0
-msgid "Date"
-msgstr ""
-
-#. module: document_page
-#: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff
-#: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
-#: view:wizard.document.page.history.show_diff:0
-msgid "Difference"
-msgstr ""
-
-#. module: document_page
-#: model:ir.actions.act_window,name:document_page.action_page
-#: model:ir.ui.menu,name:document_page.menu_page
-#: model:ir.ui.menu,name:document_page.menu_wiki
-msgid "Pages"
-msgstr ""
-
-#. module: document_page
-#: model:ir.ui.menu,name:document_page.menu_category
-msgid "Categories"
-msgstr ""
-
-#. module: document_page
-#: view:document.page:0
-msgid "Name"
-msgstr ""
-
-#. module: document_page
-#: field:document.page.create.menu,menu_parent_id:0
-msgid "Parent Menu"
-msgstr ""
-
-#. module: document_page
-#: field:document.page,write_date:0
-msgid "Modification Date"
-msgstr ""
-
-#. module: document_page
-#: field:document.page,create_date:0
-msgid "Created on"
-msgstr ""
-
-#. module: document_page
-#: code:addons/document_page/wizard/document_page_show_diff.py:50
-#, python-format
-msgid "You need to select minimum one or maximum two history revisions!"
-msgstr ""
-
-#. module: document_page
-#: model:ir.actions.act_window,name:document_page.action_history
-msgid "Page history"
-msgstr ""
-
-#. module: document_page
-#: field:document.page.history,summary:0
-msgid "Summary"
-msgstr ""
-
-#. module: document_page
-#: view:document.page:0
-msgid "e.g. Once upon a time..."
-msgstr ""
-
-#. module: document_page
-#: code:addons/document_page/wizard/wiki_make_index.py:52
-#, python-format
-msgid "There is no section in this Page."
-msgstr ""
-
-#. module: document_page
-#: view:document.page.history:0
-msgid "Document History"
-msgstr ""
-
-#. module: document_page
-#: field:document.page.create.menu,menu_name:0
-msgid "Menu Name"
-msgstr ""
-
-#. module: document_page
-#: field:document.page.history,page_id:0
-msgid "Page"
-msgstr ""
-
-#. module: document_page
-#: field:document.page,history_ids:0
-msgid "History"
-msgstr ""
-
 #. module: document_page
 #: model:ir.actions.act_window,help:document_page.action_page
 msgid "<p class=\"oe_view_nocontent_create\">\n"
@@ -231,29 +24,78 @@ msgid "<p class=\"oe_view_nocontent_create\">\n"
 msgstr ""
 
 #. module: document_page
-#: view:document.page.create.menu:0
+#: view:document.page:document_page.view_wiki_filter
+#: field:document.page,create_uid:0
+msgid "Author"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.create.menu:document_page.view_wiki_create_menu
+msgid "Cancel"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:document_page.view_category_tree
+#: model:ir.ui.menu,name:document_page.menu_category
+msgid "Categories"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+#: view:document.page:document_page.view_wiki_form
+#: field:document.page,parent_id:0
+#: selection:document.page,type:0
+#: model:ir.actions.act_window,name:document_page.action_category
+msgid "Category"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,child_ids:0
+msgid "Children"
+msgstr ""
+
+#. module: document_page
+#: view:wizard.document.page.history.show_diff:document_page.view_wiki_show_diff
+msgid "Close"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+#: view:document.page:document_page.view_wiki_form
+#: field:document.page,content:0
+#: selection:document.page,type:0
+#: field:document.page.history,content:0
+msgid "Content"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.create.menu:document_page.view_wiki_create_menu
 #: model:ir.actions.act_window,name:document_page.action_related_page_create_menu
 #: model:ir.actions.act_window,name:document_page.action_wiki_create_menu
 msgid "Create Menu"
 msgstr ""
 
 #. module: document_page
-#: field:document.page,display_content:0
-msgid "Displayed Content"
+#: field:document.page.create.menu,create_uid:0
+#: field:wizard.document.page.history.show_diff,create_uid:0
+msgid "Created by"
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/document_page.py:129
-#: code:addons/document_page/wizard/document_page_show_diff.py:50
-#: code:addons/document_page/wizard/wiki_make_index.py:52
-#, python-format
-msgid "Warning!"
+#: field:document.page,create_date:0
+#: field:document.page.create.menu,create_date:0
+#: field:wizard.document.page.history.show_diff,create_date:0
+msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: view:document.page.create.menu:0
-#: view:wizard.document.page.history.show_diff:0
-msgid "Cancel"
+#: field:document.page.history,create_date:0
+msgid "Date"
+msgstr ""
+
+#. module: document_page
+#: help:document.page,message_last_post:0
+msgid "Date of the last message posted on the record."
 msgstr ""
 
 #. module: document_page
@@ -262,12 +104,245 @@ msgid "Diff"
 msgstr ""
 
 #. module: document_page
-#: view:document.page:0
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
+#: view:wizard.document.page.history.show_diff:document_page.view_wiki_show_diff
+msgid "Difference"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.history:document_page.view_wiki_history_tree
+msgid "Document History"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+#: view:document.page:document_page.view_wiki_form
+#: view:document.page:document_page.view_wiki_menu_form
+#: view:document.page:document_page.view_wiki_tree
+#: view:document.page:document_page.view_wiki_tree_children
+#: model:ir.model,name:document_page.model_document_page
+msgid "Document Page"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.history:document_page.wiki_history_form
+#: model:ir.model,name:document_page.model_document_page_history
+msgid "Document Page History"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
 msgid "Document Type"
 msgstr ""
 
 #. module: document_page
-#: field:document.page,child_ids:0
-msgid "Children"
+#: view:document.page:document_page.view_category_form
+msgid "Documents"
 msgstr ""
 
+#. module: document_page
+#: field:document.page,message_follower_ids:0
+msgid "Followers"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+msgid "Group By..."
+msgstr ""
+
+#. module: document_page
+#: field:document.page,history_ids:0
+msgid "History"
+msgstr ""
+
+#. module: document_page
+#: help:document.page,message_summary:0
+msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+msgstr ""
+
+#. module: document_page
+#: field:document.page,id:0
+#: field:document.page.create.menu,id:0
+#: field:document.page.history,id:0
+#: field:wizard.document.page.history.show_diff,id:0
+msgid "ID"
+msgstr ""
+
+#. module: document_page
+#: help:document.page,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr ""
+
+#. module: document_page
+#: field:document.page,message_is_follower:0
+msgid "Is a Follower"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:document_page.view_wiki_form
+msgid "Last Content"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+#: field:document.page,write_uid:0
+msgid "Last Contributor"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,message_last_post:0
+msgid "Last Message Date"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.create.menu,write_uid:0
+#: field:document.page.history,write_uid:0
+#: field:wizard.document.page.history.show_diff,write_uid:0
+msgid "Last Updated by"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.create.menu,write_date:0
+#: field:document.page.history,write_date:0
+#: field:wizard.document.page.history.show_diff,write_date:0
+msgid "Last Updated on"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,menu_id:0
+msgid "Menu"
+msgstr ""
+
+#. module: document_page
+#: view:document.page.create.menu:document_page.view_wiki_create_menu
+msgid "Menu Information"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.create.menu,menu_name:0
+msgid "Menu Name"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,message_ids:0
+msgid "Messages"
+msgstr ""
+
+#. module: document_page
+#: help:document.page,message_ids:0
+msgid "Messages and communication history"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,write_date:0
+msgid "Modification Date"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.history,create_uid:0
+msgid "Modified By"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+#: view:document.page:document_page.view_wiki_form
+#: view:document.page:document_page.view_wiki_menu_form
+msgid "Name"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.history,page_id:0
+msgid "Page"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_related_page_history
+msgid "Page History"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_history
+msgid "Page history"
+msgstr ""
+
+#. module: document_page
+#: help:document.page,type:0
+msgid "Page type"
+msgstr ""
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_page
+#: model:ir.ui.menu,name:document_page.menu_page
+#: model:ir.ui.menu,name:document_page.menu_wiki
+msgid "Pages"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.menu,name:document_page.menu_page_history
+msgid "Pages history"
+msgstr ""
+
+#. module: document_page
+#: field:document.page.create.menu,menu_parent_id:0
+msgid "Parent Menu"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,message_summary:0
+#: field:document.page.history,summary:0
+msgid "Summary"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+msgid "Template"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+msgid "Template that will be used as a content template for all new page of this category."
+msgstr ""
+
+#. module: document_page
+#: code:addons/document_page/document_page.py:175
+#, python-format
+msgid "There are no changes in revisions."
+msgstr ""
+
+#. module: document_page
+#: field:document.page,name:0
+msgid "Title"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,type:0
+msgid "Type"
+msgstr ""
+
+#. module: document_page
+#: field:document.page,message_unread:0
+msgid "Unread Messages"
+msgstr ""
+
+#. module: document_page
+#: model:ir.model,name:document_page.model_document_page_create_menu
+msgid "Wizard Create Menu"
+msgstr ""
+
+#. module: document_page
+#: code:addons/document_page/wizard/document_page_show_diff.py:50
+#, python-format
+msgid "You need to select minimum one or maximum two history revisions!"
+msgstr ""
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+#: view:document.page:document_page.view_wiki_form
+msgid "e.g. Once upon a time..."
+msgstr ""
+
+#. module: document_page
+#: view:document.page.create.menu:document_page.view_wiki_create_menu
+msgid "or"
+msgstr ""
diff --git a/document_page/i18n/es.po b/document_page/i18n/es.po
index f953ef74..3ac0a247 100644
--- a/document_page/i18n/es.po
+++ b/document_page/i18n/es.po
@@ -1,24 +1,51 @@
-# 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.
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* document_page
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: openobject-addons\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
-"POT-Creation-Date: 2013-06-07 19:37+0000\n"
-"PO-Revision-Date: 2013-06-18 07:39+0000\n"
-"Last-Translator: Pedro Manuel Baeza <pedro.baeza@gmail.com>\n"
-"Language-Team: Spanish <es@li.org>\n"
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-27 20:33+0000\n"
+"PO-Revision-Date: 2015-07-27 20:33+0000\n"
+"Last-Translator: Glen Sojo <glen.sojo@clearcorp.co.cr>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2013-11-21 06:08+0000\n"
-"X-Generator: Launchpad (build 16831)\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
 
 #. module: document_page
-#: view:document.page:0
+#: model:ir.actions.act_window,help:document_page.action_page
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new web page.\n"
+"              </p>\n"
+"            "
+msgstr "<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear una nueva página web.\n"
+"</p>\n"
+"            "
+
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+#: field:document.page,create_uid:0
+msgid "Author"
+msgstr "Autor"
+
+#. module: document_page
+#: view:document.page.create.menu:document_page.view_wiki_create_menu
+msgid "Cancel"
+msgstr "Cancelar"
+
+#. module: document_page
+#: view:document.page:document_page.view_category_tree
+#: model:ir.ui.menu,name:document_page.menu_category
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+#: view:document.page:document_page.view_wiki_form
 #: field:document.page,parent_id:0
 #: selection:document.page,type:0
 #: model:ir.actions.act_window,name:document_page.action_category
@@ -26,35 +53,18 @@ msgid "Category"
 msgstr "Categoría"
 
 #. module: document_page
-#: view:document.page:0
-#: field:document.page,write_uid:0
-msgid "Last Contributor"
-msgstr "Último colaborador"
+#: field:document.page,child_ids:0
+msgid "Children"
+msgstr "Hijos"
 
 #. module: document_page
-#: view:document.page:0
-#: field:document.page,create_uid:0
-msgid "Author"
-msgstr "Autor"
+#: view:wizard.document.page.history.show_diff:document_page.view_wiki_show_diff
+msgid "Close"
+msgstr "Cerrar"
 
 #. module: document_page
-#: field:document.page,menu_id:0
-msgid "Menu"
-msgstr "Menú"
-
-#. module: document_page
-#: view:document.page:0
-#: model:ir.model,name:document_page.model_document_page
-msgid "Document Page"
-msgstr "Página de documento"
-
-#. module: document_page
-#: model:ir.actions.act_window,name:document_page.action_related_page_history
-msgid "Page History"
-msgstr "Historial página"
-
-#. module: document_page
-#: view:document.page:0
+#: view:document.page:document_page.view_wiki_filter
+#: view:document.page:document_page.view_wiki_form
 #: field:document.page,content:0
 #: selection:document.page,type:0
 #: field:document.page.history,content:0
@@ -62,92 +72,208 @@ msgid "Content"
 msgstr "Contenido"
 
 #. module: document_page
-#: view:document.page:0
-msgid "Group By..."
-msgstr "Agrupar por..."
+#: view:document.page.create.menu:document_page.view_wiki_create_menu
+#: model:ir.actions.act_window,name:document_page.action_related_page_create_menu
+#: model:ir.actions.act_window,name:document_page.action_wiki_create_menu
+msgid "Create Menu"
+msgstr "Crear menú"
 
 #. module: document_page
-#: view:document.page:0
-msgid "Template"
-msgstr "Plantilla"
+#: field:document.page.create.menu,create_uid:0
+#: field:wizard.document.page.history.show_diff,create_uid:0
+msgid "Created by"
+msgstr "Creado por"
 
 #. module: document_page
-#: view:document.page:0
-msgid ""
-"that will be used as a content template for all new page of this category."
-msgstr ""
-"esto será usado como una plantilla de contenido para todas las páginas de "
-"esta categoría."
-
-#. module: document_page
-#: field:document.page,name:0
-msgid "Title"
-msgstr "Título"
-
-#. module: document_page
-#: model:ir.model,name:document_page.model_document_page_create_menu
-msgid "Wizard Create Menu"
-msgstr "Asistente crear menú"
-
-#. module: document_page
-#: field:document.page,type:0
-msgid "Type"
-msgstr "Tipo"
-
-#. module: document_page
-#: model:ir.model,name:document_page.model_wizard_document_page_history_show_diff
-msgid "wizard.document.page.history.show_diff"
-msgstr "wizard.document.page.history.show_diff"
-
-#. module: document_page
-#: field:document.page.history,create_uid:0
-msgid "Modified By"
-msgstr "Modificado por"
-
-#. module: document_page
-#: view:document.page.create.menu:0
-msgid "or"
-msgstr "o"
-
-#. module: document_page
-#: help:document.page,type:0
-msgid "Page type"
-msgstr "Tipo de página"
-
-#. module: document_page
-#: view:document.page.create.menu:0
-msgid "Menu Information"
-msgstr "Información del menú"
-
-#. module: document_page
-#: view:document.page.history:0
-#: model:ir.model,name:document_page.model_document_page_history
-msgid "Document Page History"
-msgstr "Historia de página de documento"
-
-#. module: document_page
-#: model:ir.ui.menu,name:document_page.menu_page_history
-msgid "Pages history"
-msgstr "Historial de páginas"
-
-#. module: document_page
-#: code:addons/document_page/document_page.py:129
-#, python-format
-msgid "There are no changes in revisions."
-msgstr "No hay cambios en las revisiones."
+#: field:document.page,create_date:0
+#: field:document.page.create.menu,create_date:0
+#: field:wizard.document.page.history.show_diff,create_date:0
+msgid "Created on"
+msgstr "Creado en"
 
 #. module: document_page
 #: field:document.page.history,create_date:0
 msgid "Date"
 msgstr "Fecha"
 
+#. module: document_page
+#: help:document.page,message_last_post:0
+msgid "Date of the last message posted on the record."
+msgstr "Fecha del último mensaje publicado en el registro."
+
+#. module: document_page
+#: field:wizard.document.page.history.show_diff,diff:0
+msgid "Diff"
+msgstr "Dif."
+
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff
 #: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
-#: view:wizard.document.page.history.show_diff:0
+#: view:wizard.document.page.history.show_diff:document_page.view_wiki_show_diff
 msgid "Difference"
 msgstr "Diferencia"
 
+#. module: document_page
+#: view:document.page.history:document_page.view_wiki_history_tree
+msgid "Document History"
+msgstr "Historial del Documento"
+
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+#: view:document.page:document_page.view_wiki_form
+#: view:document.page:document_page.view_wiki_menu_form
+#: view:document.page:document_page.view_wiki_tree
+#: view:document.page:document_page.view_wiki_tree_children
+#: model:ir.model,name:document_page.model_document_page
+msgid "Document Page"
+msgstr "Página de documento"
+
+#. module: document_page
+#: view:document.page.history:document_page.wiki_history_form
+#: model:ir.model,name:document_page.model_document_page_history
+msgid "Document Page History"
+msgstr "Historia de página de documento"
+
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+msgid "Document Type"
+msgstr "Tipo de documento"
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+msgid "Documents"
+msgstr "Documentos"
+
+#. module: document_page
+#: field:document.page,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
+
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+msgid "Group By..."
+msgstr "Agrupar por..."
+
+#. module: document_page
+#: field:document.page,history_ids:0
+msgid "History"
+msgstr "Historial"
+
+#. module: document_page
+#: help:document.page,message_summary:0
+msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+msgstr "Sostiene el resumen Chatter ( número de mensajes , ... ). Este resumen está directamente en formato html para ser insertada en las vistas kanban."
+
+#. module: document_page
+#: field:document.page,id:0
+#: field:document.page.create.menu,id:0
+#: field:document.page.history,id:0
+#: field:wizard.document.page.history.show_diff,id:0
+msgid "ID"
+msgstr "ID"
+
+#. module: document_page
+#: help:document.page,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Si está marcado nuevos mensajes requieren su atención."
+
+#. module: document_page
+#: field:document.page,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Es un seguidor"
+
+#. module: document_page
+#: view:document.page:document_page.view_wiki_form
+msgid "Last Content"
+msgstr "Ultimo contenido"
+
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+#: field:document.page,write_uid:0
+msgid "Last Contributor"
+msgstr "Último colaborador"
+
+#. module: document_page
+#: field:document.page,message_last_post:0
+msgid "Last Message Date"
+msgstr "Fecha del ultimo mensaje"
+
+#. module: document_page
+#: field:document.page.create.menu,write_uid:0
+#: field:document.page.history,write_uid:0
+#: field:wizard.document.page.history.show_diff,write_uid:0
+msgid "Last Updated by"
+msgstr "Ultima actualización por"
+
+#. module: document_page
+#: field:document.page.create.menu,write_date:0
+#: field:document.page.history,write_date:0
+#: field:wizard.document.page.history.show_diff,write_date:0
+msgid "Last Updated on"
+msgstr "Ultima actualización en"
+
+#. module: document_page
+#: field:document.page,menu_id:0
+msgid "Menu"
+msgstr "Menú"
+
+#. module: document_page
+#: view:document.page.create.menu:document_page.view_wiki_create_menu
+msgid "Menu Information"
+msgstr "Información del menú"
+
+#. module: document_page
+#: field:document.page.create.menu,menu_name:0
+msgid "Menu Name"
+msgstr "Nombre menú"
+
+#. module: document_page
+#: field:document.page,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: document_page
+#: help:document.page,message_ids:0
+msgid "Messages and communication history"
+msgstr "Mensajes e historial de comunicación"
+
+#. module: document_page
+#: field:document.page,write_date:0
+msgid "Modification Date"
+msgstr "Fecha de modificación"
+
+#. module: document_page
+#: field:document.page.history,create_uid:0
+msgid "Modified By"
+msgstr "Modificado por"
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+#: view:document.page:document_page.view_wiki_form
+#: view:document.page:document_page.view_wiki_menu_form
+msgid "Name"
+msgstr "Nombre"
+
+#. module: document_page
+#: field:document.page.history,page_id:0
+msgid "Page"
+msgstr "Página"
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_related_page_history
+msgid "Page History"
+msgstr "Historial de página"
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_history
+msgid "Page history"
+msgstr "Historial de página"
+
+#. module: document_page
+#: help:document.page,type:0
+msgid "Page type"
+msgstr "Tipo de página"
+
 #. module: document_page
 #: model:ir.actions.act_window,name:document_page.action_page
 #: model:ir.ui.menu,name:document_page.menu_page
@@ -156,14 +282,9 @@ msgid "Pages"
 msgstr "Páginas"
 
 #. module: document_page
-#: model:ir.ui.menu,name:document_page.menu_category
-msgid "Categories"
-msgstr "Categorías"
-
-#. module: document_page
-#: view:document.page:0
-msgid "Name"
-msgstr "Nombre"
+#: model:ir.ui.menu,name:document_page.menu_page_history
+msgid "Pages history"
+msgstr "Historial de páginas"
 
 #. module: document_page
 #: field:document.page.create.menu,menu_parent_id:0
@@ -171,109 +292,60 @@ msgid "Parent Menu"
 msgstr "Menú padre"
 
 #. module: document_page
-#: field:document.page,write_date:0
-msgid "Modification Date"
-msgstr "Fecha de modificación"
-
-#. module: document_page
-#: field:document.page,create_date:0
-msgid "Created on"
-msgstr "Creado en"
-
-#. module: document_page
-#: code:addons/document_page/wizard/document_page_show_diff.py:50
-#, python-format
-msgid "You need to select minimum one or maximum two history revisions!"
-msgstr ""
-"¡Necesita seleccionar mínimo una y máximo dos revisiones de historial!"
-
-#. module: document_page
-#: model:ir.actions.act_window,name:document_page.action_history
-msgid "Page history"
-msgstr "Historial de página"
-
-#. module: document_page
+#: field:document.page,message_summary:0
 #: field:document.page.history,summary:0
 msgid "Summary"
 msgstr "Resumen"
 
 #. module: document_page
-#: view:document.page:0
+#: view:document.page:document_page.view_category_form
+msgid "Template"
+msgstr "Plantilla"
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+msgid "Template that will be used as a content template for all new page of this category."
+msgstr "Plantilla que se utilizará como una plantilla de contenido para todas las nuevas páginas de esta categoría."
+
+#. module: document_page
+#: code:addons/document_page/document_page.py:175
+#, python-format
+msgid "There are no changes in revisions."
+msgstr "No hay cambios en las revisiones."
+
+#. module: document_page
+#: field:document.page,name:0
+msgid "Title"
+msgstr "Título"
+
+#. module: document_page
+#: field:document.page,type:0
+msgid "Type"
+msgstr "Tipo"
+
+#. module: document_page
+#: field:document.page,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensajes no leídos"
+
+#. module: document_page
+#: model:ir.model,name:document_page.model_document_page_create_menu
+msgid "Wizard Create Menu"
+msgstr "Asistente crear menú"
+
+#. module: document_page
+#: code:addons/document_page/wizard/document_page_show_diff.py:50
+#, python-format
+msgid "You need to select minimum one or maximum two history revisions!"
+msgstr "¡Necesita seleccionar mínimo una y máximo dos revisiones de historial!"
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+#: view:document.page:document_page.view_wiki_form
 msgid "e.g. Once upon a time..."
 msgstr "Por ejemplo, Érase una vez..."
 
 #. module: document_page
-#: view:document.page.history:0
-msgid "Document History"
-msgstr "Historial del Documento"
-
-#. module: document_page
-#: field:document.page.create.menu,menu_name:0
-msgid "Menu Name"
-msgstr "Nombre menú"
-
-#. module: document_page
-#: field:document.page.history,page_id:0
-msgid "Page"
-msgstr "Página"
-
-#. module: document_page
-#: field:document.page,history_ids:0
-msgid "History"
-msgstr "Historial"
-
-#. module: document_page
-#: model:ir.actions.act_window,help:document_page.action_page
-msgid ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"                Click to create a new web page.\n"
-"              </p>\n"
-"            "
-msgstr ""
-"<p class=\"oe_view_nocontent_create\">\n"
-"Pulse para crear una nueva página web.\n"
-"</p>\n"
-"            "
-
-#. module: document_page
-#: view:document.page.create.menu:0
-#: model:ir.actions.act_window,name:document_page.action_related_page_create_menu
-#: model:ir.actions.act_window,name:document_page.action_wiki_create_menu
-msgid "Create Menu"
-msgstr "Crear menú"
-
-#. module: document_page
-#: field:document.page,display_content:0
-msgid "Displayed Content"
-msgstr "Contenido mostrado"
-
-#. module: document_page
-#: code:addons/document_page/document_page.py:129
-#: code:addons/document_page/wizard/document_page_show_diff.py:50
-#, python-format
-msgid "Warning!"
-msgstr "¡Advertencia!"
-
-#. module: document_page
-#: view:document.page.create.menu:0
-#: view:wizard.document.page.history.show_diff:0
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: document_page
-#: field:wizard.document.page.history.show_diff,diff:0
-msgid "Diff"
-msgstr "Dif."
-
-#. module: document_page
-#: view:document.page:0
-msgid "Document Type"
-msgstr "Tipo de documento"
-
-#. module: document_page
-#: field:document.page,child_ids:0
-msgid "Children"
-msgstr "Hijos"
-
-#~ msgid "Create web pages"
-#~ msgstr "Crear páginas Web"
+#: view:document.page.create.menu:document_page.view_wiki_create_menu
+msgid "or"
+msgstr "o"
diff --git a/document_page/i18n/es_CR.po b/document_page/i18n/es_CR.po
index 79f50eaa..3ac0a247 100644
--- a/document_page/i18n/es_CR.po
+++ b/document_page/i18n/es_CR.po
@@ -1,520 +1,351 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
-# 	* wiki
+#	* document_page
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 6.0dev\n"
+"Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-02-08 01:37+0100\n"
-"PO-Revision-Date: 2012-02-20 01:10+0000\n"
-"Last-Translator: Freddy Gonzalez <freddy.gonzalez@clearcorp.co.cr>\n"
+"POT-Creation-Date: 2015-07-27 20:33+0000\n"
+"PO-Revision-Date: 2015-07-27 20:33+0000\n"
+"Last-Translator: Glen Sojo <glen.sojo@clearcorp.co.cr>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-02-21 05:55+0000\n"
-"X-Generator: Launchpad (build 14838)\n"
-"Language: \n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
 
-#. module: wiki
-#: field:wiki.groups,template:0
-msgid "Wiki Template"
-msgstr "Plantilla Wiki"
+#. module: document_page
+#: model:ir.actions.act_window,help:document_page.action_page
+msgid "<p class=\"oe_view_nocontent_create\">\n"
+"                Click to create a new web page.\n"
+"              </p>\n"
+"            "
+msgstr "<p class=\"oe_view_nocontent_create\">\n"
+"Pulse para crear una nueva página web.\n"
+"</p>\n"
+"            "
 
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_wiki
-#: model:ir.ui.menu,name:wiki.menu_action_wiki_wiki
-msgid "Wiki Pages"
-msgstr "Páginas Wiki"
-
-#. module: wiki
-#: field:wiki.groups,method:0
-msgid "Display Method"
-msgstr "Método de visualización"
-
-#. module: wiki
-#: view:wiki.wiki:0 field:wiki.wiki,create_uid:0
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+#: field:document.page,create_uid:0
 msgid "Author"
 msgstr "Autor"
 
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_wiki_page_open
-#: view:wiki.wiki.page.open:0
-msgid "Open Page"
-msgstr "Abrir página"
-
-#. module: wiki
-#: field:wiki.groups,menu_id:0
-msgid "Menu"
-msgstr "Menú"
-
-#. module: wiki
-#: field:wiki.wiki,section:0
-msgid "Section"
-msgstr "Sección"
-
-#. module: wiki
-#: help:wiki.wiki,toc:0
-msgid "Indicates that this pages have a table of contents or not"
-msgstr "Indica si estas páginas tienen una tabla de contenidos o no."
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wiki_wiki_history view:wiki.wiki.history:0
-msgid "Wiki History"
-msgstr "Historial Wiki"
-
-#. module: wiki
-#: field:wiki.wiki,minor_edit:0
-msgid "Minor edit"
-msgstr "Edición menor"
-
-#. module: wiki
-#: view:wiki.wiki:0 field:wiki.wiki,text_area:0
-msgid "Content"
-msgstr "Contenido"
-
-#. module: wiki
-#: field:wiki.wiki,child_ids:0
-msgid "Child Pages"
-msgstr "Páginas hijas"
-
-#. module: wiki
-#: field:wiki.wiki,parent_id:0
-msgid "Parent Page"
-msgstr "Página padre"
-
-#. module: wiki
-#: view:wiki.wiki:0 field:wiki.wiki,write_uid:0
-msgid "Last Contributor"
-msgstr "Último colaborador"
-
-#. module: wiki
-#: field:wiki.create.menu,menu_parent_id:0
-msgid "Parent Menu"
-msgstr "Menú padre"
-
-#. module: wiki
-#: code:addons/wiki/wizard/wiki_make_index.py:52
-#, python-format
-msgid "There is no section in this Page"
-msgstr "No hay sección en esta página"
-
-#. module: wiki
-#: field:wiki.groups,name:0 view:wiki.wiki:0 field:wiki.wiki,group_id:0
-msgid "Wiki Group"
-msgstr "Grupo Wiki"
-
-#. module: wiki
-#: field:wiki.wiki,name:0
-msgid "Title"
-msgstr "Título"
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wiki_create_menu
-msgid "Wizard Create Menu"
-msgstr "Asistente crear menú"
-
-#. module: wiki
-#: field:wiki.wiki,history_id:0
-msgid "History Lines"
-msgstr "Líneas historial"
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Page Content"
-msgstr "Contenido página"
-
-#. module: wiki
-#: code:addons/wiki/wiki.py:237 code:addons/wiki/wizard/wiki_make_index.py:52
-#, python-format
-msgid "Warning !"
-msgstr "¡Aviso!"
-
-#. module: wiki
-#: code:addons/wiki/wiki.py:237
-#, python-format
-msgid "There are no changes in revisions"
-msgstr "No hay cambios en revisiones"
-
-#. module: wiki
-#: help:wiki.wiki,section:0
-msgid "Use page section code like 1.2.1"
-msgstr "Utilice código de sección de la página, por ejemplo 1.2.1"
-
-#. module: wiki
-#: field:wiki.create.menu,menu_name:0
-msgid "Menu Name"
-msgstr "Nombre menú"
-
-#. module: wiki
-#: field:wiki.groups,notes:0
-msgid "Description"
-msgstr "Descripción"
-
-#. module: wiki
-#: field:wiki.wiki,review:0
-msgid "Needs Review"
-msgstr "Necesita revisión"
-
-#. module: wiki
-#: help:wiki.wiki,review:0
-msgid ""
-"Indicates that this page should be reviewed, raising the attention of other "
-"contributors"
-msgstr ""
-"Indica que esta página debería ser revisada, captando la atención de otros "
-"colaboradores."
-
-#. module: wiki
-#: view:wiki.create.menu:0 view:wiki.make.index:0
-msgid "Menu Information"
-msgstr "Información del menú"
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.act_wiki_wiki_history
-msgid "Page History"
-msgstr "Historial página"
-
-#. module: wiki
-#: selection:wiki.groups,method:0
-msgid "Tree"
-msgstr "Árbol"
-
-#. module: wiki
-#: view:wiki.groups:0
-msgid "Page Template"
-msgstr "Plantilla de página"
-
-#. module: wiki
-#: field:wiki.wiki,tags:0
-msgid "Keywords"
-msgstr "Palabras clave"
-
-#. module: wiki
-#: model:ir.actions.act_window,help:wiki.action_wiki
-msgid ""
-"With Wiki Pages you can share ideas and questions with your coworkers. You "
-"can create a new document that can be linked to one or several applications "
-"(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
-"There is a basic wiki editing for text format."
-msgstr ""
-"Con páginas wiki puede compartir ideas y preguntas con sus compañeros de "
-"trabajo. Puede crear un nuevo documento que puede ser relacionado con una o "
-"varias aplicaciones (CRM, Ventas, etc.). Puede utilizar palabras clave para "
-"facilitar el acceso a sus páginas wiki. Existe un editor básico para el "
-"formato texto del wiki."
-
-#. module: wiki
-#: code:addons/wiki/wizard/wiki_show_diff.py:54
-#, python-format
-msgid "Warning"
-msgstr "Advertencia"
-
-#. module: wiki
-#: help:wiki.groups,home:0
-msgid "Required to select home page if display method is Home Page"
-msgstr ""
-"Es obligado seleccionar la página de inicio si el método de visualización es "
-"Página inicial."
-
-#. module: wiki
-#: field:wiki.wiki.history,create_date:0
-msgid "Date"
-msgstr "Fecha"
-
-#. module: wiki
-#: view:wiki.make.index:0
-msgid "Want to create a Index on Selected Pages ? "
-msgstr "¿Desea crear un índice sobre las páginas seleccionadas? "
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
-#: view:wizard.wiki.history.show_diff:0
-msgid "Difference"
-msgstr "Diferencia"
-
-#. module: wiki
-#: field:wiki.groups,page_ids:0
-msgid "Pages"
-msgstr "Páginas"
-
-#. module: wiki
-#: view:wiki.groups:0
-msgid "Group Description"
-msgstr "Descripción grupo"
-
-#. module: wiki
-#: view:wiki.wiki.page.open:0
-msgid "Want to open a wiki page? "
-msgstr "¿Desea abrir una página wiki? "
-
-#. module: wiki
-#: field:wiki.groups,section:0
-msgid "Make Section ?"
-msgstr "¿Crear sección?"
-
-#. module: wiki
-#: field:wiki.wiki.history,text_area:0
-msgid "Text area"
-msgstr "Área de texto"
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Meta Information"
-msgstr "Meta información"
-
-#. module: wiki
-#: field:wiki.wiki,create_date:0
-msgid "Created on"
-msgstr "Creado en"
-
-#. module: wiki
-#: view:wiki.groups:0 view:wizard.wiki.history.show_diff:0
-msgid "Notes"
-msgstr "Notas"
-
-#. module: wiki
-#: selection:wiki.groups,method:0
-msgid "List"
-msgstr "Lista"
-
-#. module: wiki
-#: field:wiki.wiki,summary:0 field:wiki.wiki.history,summary:0
-msgid "Summary"
-msgstr "Resumen"
-
-#. module: wiki
-#: field:wiki.groups,create_date:0
-msgid "Created Date"
-msgstr "Fecha de creación"
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_history
-msgid "All Page Histories"
-msgstr "Todos los historiales de páginas"
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wiki_wiki
-msgid "wiki.wiki"
-msgstr "wiki.wiki"
-
-#. module: wiki
-#: help:wiki.groups,method:0
-msgid "Define the default behaviour of the menu created on this group"
-msgstr "Define el comportamiento por defecto del menú creado en este grupo."
-
-#. module: wiki
-#: view:wizard.wiki.history.show_diff:0
-msgid "Close"
-msgstr "Cerrar"
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
-msgid "wizard.wiki.history.show_diff"
-msgstr "asistente.wiki.historial.mostrar_dif"
-
-#. module: wiki
-#: field:wiki.wiki.history,wiki_id:0
-msgid "Wiki Id"
-msgstr "ID Wiki"
-
-#. module: wiki
-#: field:wiki.groups,home:0 selection:wiki.groups,method:0
-msgid "Home Page"
-msgstr "Página inicial"
-
-#. module: wiki
-#: help:wiki.wiki,parent_id:0
-msgid "Allows you to link with the other page with in the current topic"
-msgstr "Le permite enlazar con la otra página dentro del tema actual."
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Modification Information"
-msgstr "Información modificación"
-
-#. module: wiki
-#: help:wiki.wiki,group_id:0
-msgid "Topic, also called Wiki Group"
-msgstr "Tema, también denominado Grupo wiki."
-
-#. module: wiki
-#: model:ir.ui.menu,name:wiki.menu_wiki_configuration view:wiki.wiki:0
-msgid "Wiki"
-msgstr "Wiki"
-
-#. module: wiki
-#: field:wiki.wiki,write_date:0
-msgid "Modification Date"
-msgstr "Fecha de modificación"
-
-#. module: wiki
-#: view:wiki.groups:0
-msgid "Configuration"
-msgstr "Configuración"
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index
-#: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index_values
-#: model:ir.model,name:wiki.model_wiki_make_index view:wiki.make.index:0
-msgid "Create Index"
-msgstr "Crear índice"
-
-#. module: wiki
-#: code:addons/wiki/wizard/wiki_show_diff.py:54
-#, python-format
-msgid "You need to select minimum 1 or maximum 2 history revision!"
-msgstr ""
-"¡Debe seleccionar como mínimo 1 o como máximo 2 revisiones históricas!"
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Group By..."
-msgstr "Agrupar por..."
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
-#: view:wiki.create.menu:0 view:wiki.groups:0 view:wiki.make.index:0
-msgid "Create Menu"
-msgstr "Crear menú"
-
-#. module: wiki
-#: field:wiki.wiki.history,minor_edit:0
-msgid "This is a major edit ?"
-msgstr "¿Es ésta una edición mayor?"
-
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_wiki_groups
-#: model:ir.actions.act_window,name:wiki.action_wiki_groups_browse
-#: model:ir.model,name:wiki.model_wiki_groups
-#: model:ir.ui.menu,name:wiki.menu_action_wiki_groups view:wiki.groups:0
-msgid "Wiki Groups"
-msgstr "Grupos Wiki"
-
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Topic"
-msgstr "Tema"
-
-#. module: wiki
-#: field:wiki.wiki.history,write_uid:0
-msgid "Modify By"
-msgstr "Modificado por"
-
-#. module: wiki
-#: code:addons/wiki/web/widgets/wikimarkup/__init__.py:1981
-#: field:wiki.wiki,toc:0
-#, python-format
-msgid "Table of Contents"
-msgstr "Tabla de contenido"
-
-#. module: wiki
-#: view:wiki.groups:0 view:wiki.wiki.page.open:0
-msgid "Open Wiki Page"
-msgstr "Abrir página wiki"
-
-#. module: wiki
-#: model:ir.model,name:wiki.model_wiki_wiki_page_open
-msgid "wiz open page"
-msgstr "asistente abrir página"
-
-#. module: wiki
-#: view:wiki.create.menu:0 view:wiki.make.index:0 view:wiki.wiki.page.open:0
+#. module: document_page
+#: view:document.page.create.menu:document_page.view_wiki_create_menu
 msgid "Cancel"
 msgstr "Cancelar"
 
-#. module: wiki
-#: field:wizard.wiki.history.show_diff,file_path:0
+#. module: document_page
+#: view:document.page:document_page.view_category_tree
+#: model:ir.ui.menu,name:document_page.menu_category
+msgid "Categories"
+msgstr "Categorías"
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+#: view:document.page:document_page.view_wiki_form
+#: field:document.page,parent_id:0
+#: selection:document.page,type:0
+#: model:ir.actions.act_window,name:document_page.action_category
+msgid "Category"
+msgstr "Categoría"
+
+#. module: document_page
+#: field:document.page,child_ids:0
+msgid "Children"
+msgstr "Hijos"
+
+#. module: document_page
+#: view:wizard.document.page.history.show_diff:document_page.view_wiki_show_diff
+msgid "Close"
+msgstr "Cerrar"
+
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+#: view:document.page:document_page.view_wiki_form
+#: field:document.page,content:0
+#: selection:document.page,type:0
+#: field:document.page.history,content:0
+msgid "Content"
+msgstr "Contenido"
+
+#. module: document_page
+#: view:document.page.create.menu:document_page.view_wiki_create_menu
+#: model:ir.actions.act_window,name:document_page.action_related_page_create_menu
+#: model:ir.actions.act_window,name:document_page.action_wiki_create_menu
+msgid "Create Menu"
+msgstr "Crear menú"
+
+#. module: document_page
+#: field:document.page.create.menu,create_uid:0
+#: field:wizard.document.page.history.show_diff,create_uid:0
+msgid "Created by"
+msgstr "Creado por"
+
+#. module: document_page
+#: field:document.page,create_date:0
+#: field:document.page.create.menu,create_date:0
+#: field:wizard.document.page.history.show_diff,create_date:0
+msgid "Created on"
+msgstr "Creado en"
+
+#. module: document_page
+#: field:document.page.history,create_date:0
+msgid "Date"
+msgstr "Fecha"
+
+#. module: document_page
+#: help:document.page,message_last_post:0
+msgid "Date of the last message posted on the record."
+msgstr "Fecha del último mensaje publicado en el registro."
+
+#. module: document_page
+#: field:wizard.document.page.history.show_diff,diff:0
 msgid "Diff"
 msgstr "Dif."
 
-#. module: wiki
-#: view:wiki.wiki:0
-msgid "Need Review"
-msgstr "Necesita revisión"
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff
+#: model:ir.actions.act_window,name:document_page.action_view_wiki_show_diff_values
+#: view:wizard.document.page.history.show_diff:document_page.view_wiki_show_diff
+msgid "Difference"
+msgstr "Diferencia"
 
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.action_wiki_review
-msgid "Pages Waiting Review"
-msgstr "Páginas esperando revisión"
+#. module: document_page
+#: view:document.page.history:document_page.view_wiki_history_tree
+msgid "Document History"
+msgstr "Historial del Documento"
 
-#. module: wiki
-#: model:ir.actions.act_window,name:wiki.act_wiki_group_open
-msgid "Search Page"
-msgstr "Buscar página"
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+#: view:document.page:document_page.view_wiki_form
+#: view:document.page:document_page.view_wiki_menu_form
+#: view:document.page:document_page.view_wiki_tree
+#: view:document.page:document_page.view_wiki_tree_children
+#: model:ir.model,name:document_page.model_document_page
+msgid "Document Page"
+msgstr "Página de documento"
 
-#~ msgid ""
-#~ "The Object name must start with x_ and not contain any special character !"
-#~ msgstr ""
-#~ "¡El nombre del objeto debe empezar con x_ y no contener ningún carácter "
-#~ "especial!"
+#. module: document_page
+#: view:document.page.history:document_page.wiki_history_form
+#: model:ir.model,name:document_page.model_document_page_history
+msgid "Document Page History"
+msgstr "Historia de página de documento"
 
-#~ msgid "Wiki Groups Links"
-#~ msgstr "Enlaces grupos wiki"
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+msgid "Document Type"
+msgstr "Tipo de documento"
 
-#~ msgid "Child Groups"
-#~ msgstr "Grupos hijos"
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+msgid "Documents"
+msgstr "Documentos"
 
-#~ msgid "Wiki Configuration"
-#~ msgstr "Configuración Wiki"
+#. module: document_page
+#: field:document.page,message_follower_ids:0
+msgid "Followers"
+msgstr "Seguidores"
 
-#~ msgid "Document Management - Wiki"
-#~ msgstr "Gestión de documentos - Wiki"
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+msgid "Group By..."
+msgstr "Agrupar por..."
 
-#~ msgid "Create a Menu"
-#~ msgstr "Crear un menú"
+#. module: document_page
+#: field:document.page,history_ids:0
+msgid "History"
+msgstr "Historial"
 
-#~ msgid "History Differance"
-#~ msgstr "Diferencia historial"
+#. module: document_page
+#: help:document.page,message_summary:0
+msgid "Holds the Chatter summary (number of messages, ...). This summary is directly in html format in order to be inserted in kanban views."
+msgstr "Sostiene el resumen Chatter ( número de mensajes , ... ). Este resumen está directamente en formato html para ser insertada en las vistas kanban."
 
-#~ msgid "Group Home Page"
-#~ msgstr "Página de inicio del grupo"
+#. module: document_page
+#: field:document.page,id:0
+#: field:document.page.create.menu,id:0
+#: field:document.page.history,id:0
+#: field:wizard.document.page.history.show_diff,id:0
+msgid "ID"
+msgstr "ID"
 
-#~ msgid "Last Author"
-#~ msgstr "Último autor"
+#. module: document_page
+#: help:document.page,message_unread:0
+msgid "If checked new messages require your attention."
+msgstr "Si está marcado nuevos mensajes requieren su atención."
 
-#~ msgid "Differences"
-#~ msgstr "Diferencias"
+#. module: document_page
+#: field:document.page,message_is_follower:0
+msgid "Is a Follower"
+msgstr "Es un seguidor"
 
-#~ msgid "Document Management"
-#~ msgstr "Gestión de documentos"
+#. module: document_page
+#: view:document.page:document_page.view_wiki_form
+msgid "Last Content"
+msgstr "Ultimo contenido"
 
-#~ msgid "Invalid XML for View Architecture!"
-#~ msgstr "¡XML inválido para la definición de la vista!"
+#. module: document_page
+#: view:document.page:document_page.view_wiki_filter
+#: field:document.page,write_uid:0
+msgid "Last Contributor"
+msgstr "Último colaborador"
 
-#~ msgid "Parent Group"
-#~ msgstr "Grupo padre"
+#. module: document_page
+#: field:document.page,message_last_post:0
+msgid "Last Message Date"
+msgstr "Fecha del ultimo mensaje"
 
-#~ msgid "Wiki Differance"
-#~ msgstr "Diferencia Wiki"
+#. module: document_page
+#: field:document.page.create.menu,write_uid:0
+#: field:document.page.history,write_uid:0
+#: field:wizard.document.page.history.show_diff,write_uid:0
+msgid "Last Updated by"
+msgstr "Ultima actualización por"
 
+#. module: document_page
+#: field:document.page.create.menu,write_date:0
+#: field:document.page.history,write_date:0
+#: field:wizard.document.page.history.show_diff,write_date:0
+msgid "Last Updated on"
+msgstr "Ultima actualización en"
+
+#. module: document_page
+#: field:document.page,menu_id:0
+msgid "Menu"
+msgstr "Menú"
+
+#. module: document_page
+#: view:document.page.create.menu:document_page.view_wiki_create_menu
+msgid "Menu Information"
+msgstr "Información del menú"
+
+#. module: document_page
+#: field:document.page.create.menu,menu_name:0
+msgid "Menu Name"
+msgstr "Nombre menú"
+
+#. module: document_page
+#: field:document.page,message_ids:0
+msgid "Messages"
+msgstr "Mensajes"
+
+#. module: document_page
+#: help:document.page,message_ids:0
+msgid "Messages and communication history"
+msgstr "Mensajes e historial de comunicación"
+
+#. module: document_page
+#: field:document.page,write_date:0
+msgid "Modification Date"
+msgstr "Fecha de modificación"
+
+#. module: document_page
+#: field:document.page.history,create_uid:0
+msgid "Modified By"
+msgstr "Modificado por"
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+#: view:document.page:document_page.view_wiki_form
+#: view:document.page:document_page.view_wiki_menu_form
+msgid "Name"
+msgstr "Nombre"
+
+#. module: document_page
+#: field:document.page.history,page_id:0
+msgid "Page"
+msgstr "Página"
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_related_page_history
+msgid "Page History"
+msgstr "Historial de página"
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_history
+msgid "Page history"
+msgstr "Historial de página"
+
+#. module: document_page
+#: help:document.page,type:0
+msgid "Page type"
+msgstr "Tipo de página"
+
+#. module: document_page
+#: model:ir.actions.act_window,name:document_page.action_page
+#: model:ir.ui.menu,name:document_page.menu_page
+#: model:ir.ui.menu,name:document_page.menu_wiki
+msgid "Pages"
+msgstr "Páginas"
+
+#. module: document_page
+#: model:ir.ui.menu,name:document_page.menu_page_history
+msgid "Pages history"
+msgstr "Historial de páginas"
+
+#. module: document_page
+#: field:document.page.create.menu,menu_parent_id:0
+msgid "Parent Menu"
+msgstr "Menú padre"
+
+#. module: document_page
+#: field:document.page,message_summary:0
+#: field:document.page.history,summary:0
+msgid "Summary"
+msgstr "Resumen"
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+msgid "Template"
+msgstr "Plantilla"
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+msgid "Template that will be used as a content template for all new page of this category."
+msgstr "Plantilla que se utilizará como una plantilla de contenido para todas las nuevas páginas de esta categoría."
+
+#. module: document_page
+#: code:addons/document_page/document_page.py:175
 #, python-format
-#~ msgid "No action found"
-#~ msgstr "No se ha encontrado la acción"
+msgid "There are no changes in revisions."
+msgstr "No hay cambios en las revisiones."
 
-#~ msgid "Modifications"
-#~ msgstr "Modificaciones"
+#. module: document_page
+#: field:document.page,name:0
+msgid "Title"
+msgstr "Título"
 
-#~ msgid "History"
-#~ msgstr "Historial"
+#. module: document_page
+#: field:document.page,type:0
+msgid "Type"
+msgstr "Tipo"
 
-#~ msgid "Tags"
-#~ msgstr "Etiquetas"
+#. module: document_page
+#: field:document.page,message_unread:0
+msgid "Unread Messages"
+msgstr "Mensajes no leídos"
 
-#~ msgid "Invalid model name in the action definition."
-#~ msgstr "Nombre de modelo no válido en la definición de acción."
+#. module: document_page
+#: model:ir.model,name:document_page.model_document_page_create_menu
+msgid "Wizard Create Menu"
+msgstr "Asistente crear menú"
 
-#~ msgid ""
-#~ "\n"
-#~ "The base module to manage documents(wiki)\n"
-#~ "\n"
-#~ "keep track for the wiki groups, pages, and history\n"
-#~ "    "
-#~ msgstr ""
-#~ "\n"
-#~ "El módulo base para gestionar documentos (wiki)\n"
-#~ "\n"
-#~ "gestione los grupos, páginas e historial del wiki\n"
-#~ "    "
+#. module: document_page
+#: code:addons/document_page/wizard/document_page_show_diff.py:50
+#, python-format
+msgid "You need to select minimum one or maximum two history revisions!"
+msgstr "¡Necesita seleccionar mínimo una y máximo dos revisiones de historial!"
+
+#. module: document_page
+#: view:document.page:document_page.view_category_form
+#: view:document.page:document_page.view_wiki_form
+msgid "e.g. Once upon a time..."
+msgstr "Por ejemplo, Érase una vez..."
+
+#. module: document_page
+#: view:document.page.create.menu:document_page.view_wiki_create_menu
+msgid "or"
+msgstr "o"
diff --git a/document_page/wizard/document_page_create_menu.py b/document_page/wizard/document_page_create_menu.py
index 07bfb4ec..91821718 100644
--- a/document_page/wizard/document_page_create_menu.py
+++ b/document_page/wizard/document_page_create_menu.py
@@ -51,16 +51,19 @@ class document_page_create_menu(models.TransientModel):
         obj_page = self.env['document.page']
         obj_menu = self.env['ir.ui.menu']
         obj_action = self.env['ir.actions.act_window']
+        obj_model_data = self.env['ir.model.data']
         page_id = self.env.context.get('active_id', False)
         page = obj_page.browse(page_id)
 
         data = self[0]
+        view_id = obj_model_data.sudo().get_object_reference(
+            'document_page', 'view_wiki_menu_form')[1]
         value = {
             'name': 'Document Page',
             'view_type': 'form',
             'view_mode': 'form,tree',
             'res_model': 'document.page',
-            'view_id': False,
+            'view_id': view_id,
             'type': 'ir.actions.act_window',
             'target': 'inlineview',
         }
diff --git a/document_page_approval/document_page_approval.py b/document_page_approval/document_page_approval.py
index 1d5002d5..371a70df 100644
--- a/document_page_approval/document_page_approval.py
+++ b/document_page_approval/document_page_approval.py
@@ -20,8 +20,9 @@
 ##############################################################################
 
 from datetime import datetime
+from openerp.tools.translate import _
 from openerp.tools import DEFAULT_SERVER_DATETIME_FORMAT
-from openerp import models, fields
+from openerp import models, fields, SUPERUSER_ID
 
 
 class document_page_history_wkfl(models.Model):
@@ -45,12 +46,27 @@ class document_page_history_wkfl(models.Model):
         return True
 
     def page_approval_approved(self, cr, uid, ids, context=None):
+        model_data_obj = self.pool.get('ir.model.data')
+        message_obj = self.pool.get('mail.message')
         self.write(cr, uid, ids, {
             'state': 'approved',
             'approved_date': datetime.now().strftime(
                 DEFAULT_SERVER_DATETIME_FORMAT),
             'approved_uid': uid
         }, context=context)
+        # Notify followers a new version is available
+        for page_history in self.browse(cr, uid, ids, context=context):
+            subtype_id = model_data_obj.get_object_reference(
+                cr, SUPERUSER_ID, 'mail', 'mt_comment')[1]
+            message_obj.create(
+                cr, uid,
+                {'res_id': page_history.page_id.id,
+                 'model': 'document.page',
+                 'subtype_id': subtype_id,
+                 'body': _('New version of the document %s'
+                           ' approved.') % page_history.page_id.name
+                 }
+            )
         return True
 
     def _can_user_approve_page(self):
diff --git a/document_page_approval/document_page_view.xml b/document_page_approval/document_page_view.xml
index 3cf9e574..e12885fa 100644
--- a/document_page_approval/document_page_view.xml
+++ b/document_page_approval/document_page_view.xml
@@ -36,18 +36,41 @@
             <field name="arch" type="xml">
                 <field name="display_content"
                        position="before">
-                    <group class="oe_read_only"
-                           attrs="{'invisible':[('type','!=','content')]}">
+                    <group class="oe_read_only">
                         <field name="approved_date" />
                         <field name="approved_uid" />
                     </group>
                 </field>
+            </field>
+        </record>
+
+        <record id="view_wiki_menu_form_inherit" model="ir.ui.view">
+            <field name="name">document.page.form</field>
+            <field name="model">document.page</field>
+            <field name="inherit_id"
+                   ref="document_page.view_wiki_menu_form" />
+            <field name="arch" type="xml">
+                <field name="display_content"
+                       position="before">
+                    <group class="oe_read_only"
+                        attrs="{'invisible':[('type','!=','content')]}">
+                        <field name="approved_date" />
+                        <field name="approved_uid" />
+                    </group>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_category_form_inherit" model="ir.ui.view">
+            <field name="name">document.page.category.form</field>
+            <field name="model">document.page</field>
+            <field name="inherit_id"
+                   ref="document_page.view_category_form" />
+            <field name="arch" type="xml">
                 <field name="parent_id" position="after">
-                    <field name="approval_required"
-                           attrs="{'invisible':[('type','=','content')]}"/>
+                    <field name="approval_required"/>
                     <field name="approver_gid"
-                           attrs="{'invisible':['|',('type','=','content'),
-                        ('approval_required','!=', True)], 'required':[('approval_required','=', True)]}"/>
+                           attrs="{'invisible':[('approval_required','!=', True)], 'required':[('approval_required','=', True)]}"/>
                 </field>
             </field>
         </record>
diff --git a/document_page_approval/i18n/document_page_approval.pot b/document_page_approval/i18n/document_page_approval.pot
index 4ddc9733..479c2949 100644
--- a/document_page_approval/i18n/document_page_approval.pot
+++ b/document_page_approval/i18n/document_page_approval.pot
@@ -1,13 +1,13 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
 #	* document_page_approval
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: OpenERP Server 7.0\n"
+"Project-Id-Version: Odoo Server 8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-07-19 03:58+0000\n"
-"PO-Revision-Date: 2013-07-19 03:58+0000\n"
+"POT-Creation-Date: 2015-07-27 20:53+0000\n"
+"PO-Revision-Date: 2015-07-27 20:53+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -15,22 +15,6 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: \n"
 
-#. module: document_page_approval
-#: field:document.page.history,state:0
-msgid "Status"
-msgstr ""
-
-#. module: document_page_approval
-#: field:document.page,approval_required:0
-msgid "Require approval"
-msgstr ""
-
-#. module: document_page_approval
-#: field:document.page,is_parent_approval_required:0
-#: field:document.page.history,is_parent_approval_required:0
-msgid "parent approval"
-msgstr ""
-
 #. module: document_page_approval
 #: model:email.template,body_html:document_page_approval.email_template_new_draft_need_approval
 msgid "\n"
@@ -39,7 +23,7 @@ msgid "\n"
 "<p>The page \"${object.page_id.name}\" has been modified and need your approval.</p>\n"
 "\n"
 "<p>You can review the new version here : <a href=\"${object.get_page_url}\">${object.get_page_url}</a></p>\n"
-" \n"
+"\n"
 "<p>Have a great day.<br/>\n"
 "--<br/>\n"
 "OpenERP</p>\n"
@@ -47,54 +31,7 @@ msgid "\n"
 msgstr ""
 
 #. module: document_page_approval
-#: model:ir.model,name:document_page_approval.model_document_page
-msgid "Document Page"
-msgstr ""
-
-#. module: document_page_approval
-#: field:document.page,approved_uid:0
-#: field:document.page.history,approved_uid:0
-msgid "Approved By"
-msgstr ""
-
-#. module: document_page_approval
-#: model:email.template,subject:document_page_approval.email_template_new_draft_need_approval
-msgid "New version of \"${object.page_id.name}\" to approve"
-msgstr ""
-
-#. module: document_page_approval
-#: selection:document.page.history,state:0
-msgid "Draft"
-msgstr ""
-
-#. module: document_page_approval
-#: field:document.page.history,get_page_url:0
-msgid "URL"
-msgstr ""
-
-#. module: document_page_approval
-#: field:document.page,approved_date:0
-#: field:document.page.history,approved_date:0
-msgid "Approved Date"
-msgstr ""
-
-#. module: document_page_approval
-#: field:document.page.history,can_user_approve_page:0
-msgid "can user approve this page"
-msgstr ""
-
-#. module: document_page_approval
-#: field:document.page,approver_gid:0
-msgid "Approver group"
-msgstr ""
-
-#. module: document_page_approval
-#: model:ir.model,name:document_page_approval.model_document_page_history
-msgid "Document Page History"
-msgstr ""
-
-#. module: document_page_approval
-#: view:document.page.history:0
+#: view:document.page.history:document_page_approval.wiki_history_form_inherit
 msgid "Approve"
 msgstr ""
 
@@ -104,7 +41,52 @@ msgid "Approved"
 msgstr ""
 
 #. module: document_page_approval
-#: field:document.page.history,get_approvers_email:0
-msgid "get all approvers email"
+#: field:document.page.history,approved_uid:0
+msgid "Approved By"
 msgstr ""
 
+#. module: document_page_approval
+#: field:document.page.history,approved_date:0
+msgid "Approved Date"
+msgstr ""
+
+#. module: document_page_approval
+#: field:document.page,approver_gid:0
+msgid "Approver group"
+msgstr ""
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page
+msgid "Document Page"
+msgstr ""
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page_history
+msgid "Document Page History"
+msgstr ""
+
+#. module: document_page_approval
+#: selection:document.page.history,state:0
+msgid "Draft"
+msgstr ""
+
+#. module: document_page_approval
+#: model:email.template,subject:document_page_approval.email_template_new_draft_need_approval
+msgid "New version of \"${object.page_id.name}\" to approve"
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/document_page_approval.py:66
+#, python-format
+msgid "New version of the document %s approved."
+msgstr ""
+
+#. module: document_page_approval
+#: field:document.page,approval_required:0
+msgid "Require approval"
+msgstr ""
+
+#. module: document_page_approval
+#: field:document.page.history,state:0
+msgid "Status"
+msgstr ""
diff --git a/document_page_approval/i18n/es.po b/document_page_approval/i18n/es.po
new file mode 100644
index 00000000..89890dfb
--- /dev/null
+++ b/document_page_approval/i18n/es.po
@@ -0,0 +1,102 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* document_page_approval
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-27 20:53+0000\n"
+"PO-Revision-Date: 2015-07-27 20:53+0000\n"
+"Last-Translator: Glen Sojo <glen.sojo@clearcorp.co.cr>\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: document_page_approval
+#: model:email.template,body_html:document_page_approval.email_template_new_draft_need_approval
+msgid "\n"
+"<p>Hello,</p>\n"
+"\n"
+"<p>The page \"${object.page_id.name}\" has been modified and need your approval.</p>\n"
+"\n"
+"<p>You can review the new version here : <a href=\"${object.get_page_url}\">${object.get_page_url}</a></p>\n"
+"\n"
+"<p>Have a great day.<br/>\n"
+"--<br/>\n"
+"OpenERP</p>\n"
+"            "
+msgstr "\n"
+"<p>Hola,</p>\n"
+"\n"
+"<p>La página \"${object.page_id.name}\" ha sido modificada y necesita tu aprobación.</p>\n"
+"\n"
+"<p>Puedes revisar la nueva versión aquí: <a href=\"${object.get_page_url}\">${object.get_page_url}</a></p>\n"
+"\n"
+"<p>Que tenga un buen día.<br/>\n"
+"--<br/>\n"
+"OpenERP</p>\n"
+"            "
+
+#. module: document_page_approval
+#: view:document.page.history:document_page_approval.wiki_history_form_inherit
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: document_page_approval
+#: selection:document.page.history,state:0
+msgid "Approved"
+msgstr "Aprobado"
+
+#. module: document_page_approval
+#: field:document.page.history,approved_uid:0
+msgid "Approved By"
+msgstr "Aprobado por"
+
+#. module: document_page_approval
+#: field:document.page.history,approved_date:0
+msgid "Approved Date"
+msgstr "Fecha de aprobación"
+
+#. module: document_page_approval
+#: field:document.page,approver_gid:0
+msgid "Approver group"
+msgstr "Grupo aprobador"
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page
+msgid "Document Page"
+msgstr "Página de documento"
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page_history
+msgid "Document Page History"
+msgstr "Historia de página de documento"
+
+#. module: document_page_approval
+#: selection:document.page.history,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: document_page_approval
+#: model:email.template,subject:document_page_approval.email_template_new_draft_need_approval
+msgid "New version of \"${object.page_id.name}\" to approve"
+msgstr "Nueva versión de \"${object.page_id.name}\" para aprobar"
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/document_page_approval.py:66
+#, python-format
+msgid "New version of the document %s approved."
+msgstr "Nueva versión del documento %s aprobada."
+
+#. module: document_page_approval
+#: field:document.page,approval_required:0
+msgid "Require approval"
+msgstr "Requiere aprobación"
+
+#. module: document_page_approval
+#: field:document.page.history,state:0
+msgid "Status"
+msgstr "Estado"
diff --git a/document_page_approval/i18n/es_CR.po b/document_page_approval/i18n/es_CR.po
new file mode 100644
index 00000000..89890dfb
--- /dev/null
+++ b/document_page_approval/i18n/es_CR.po
@@ -0,0 +1,102 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* document_page_approval
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-07-27 20:53+0000\n"
+"PO-Revision-Date: 2015-07-27 20:53+0000\n"
+"Last-Translator: Glen Sojo <glen.sojo@clearcorp.co.cr>\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: document_page_approval
+#: model:email.template,body_html:document_page_approval.email_template_new_draft_need_approval
+msgid "\n"
+"<p>Hello,</p>\n"
+"\n"
+"<p>The page \"${object.page_id.name}\" has been modified and need your approval.</p>\n"
+"\n"
+"<p>You can review the new version here : <a href=\"${object.get_page_url}\">${object.get_page_url}</a></p>\n"
+"\n"
+"<p>Have a great day.<br/>\n"
+"--<br/>\n"
+"OpenERP</p>\n"
+"            "
+msgstr "\n"
+"<p>Hola,</p>\n"
+"\n"
+"<p>La página \"${object.page_id.name}\" ha sido modificada y necesita tu aprobación.</p>\n"
+"\n"
+"<p>Puedes revisar la nueva versión aquí: <a href=\"${object.get_page_url}\">${object.get_page_url}</a></p>\n"
+"\n"
+"<p>Que tenga un buen día.<br/>\n"
+"--<br/>\n"
+"OpenERP</p>\n"
+"            "
+
+#. module: document_page_approval
+#: view:document.page.history:document_page_approval.wiki_history_form_inherit
+msgid "Approve"
+msgstr "Aprobar"
+
+#. module: document_page_approval
+#: selection:document.page.history,state:0
+msgid "Approved"
+msgstr "Aprobado"
+
+#. module: document_page_approval
+#: field:document.page.history,approved_uid:0
+msgid "Approved By"
+msgstr "Aprobado por"
+
+#. module: document_page_approval
+#: field:document.page.history,approved_date:0
+msgid "Approved Date"
+msgstr "Fecha de aprobación"
+
+#. module: document_page_approval
+#: field:document.page,approver_gid:0
+msgid "Approver group"
+msgstr "Grupo aprobador"
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page
+msgid "Document Page"
+msgstr "Página de documento"
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page_history
+msgid "Document Page History"
+msgstr "Historia de página de documento"
+
+#. module: document_page_approval
+#: selection:document.page.history,state:0
+msgid "Draft"
+msgstr "Borrador"
+
+#. module: document_page_approval
+#: model:email.template,subject:document_page_approval.email_template_new_draft_need_approval
+msgid "New version of \"${object.page_id.name}\" to approve"
+msgstr "Nueva versión de \"${object.page_id.name}\" para aprobar"
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/document_page_approval.py:66
+#, python-format
+msgid "New version of the document %s approved."
+msgstr "Nueva versión del documento %s aprobada."
+
+#. module: document_page_approval
+#: field:document.page,approval_required:0
+msgid "Require approval"
+msgstr "Requiere aprobación"
+
+#. module: document_page_approval
+#: field:document.page.history,state:0
+msgid "Status"
+msgstr "Estado"