[IMP] - Changed string from email template.

[IMP] - Improved views to match document_page improvements.
[IMP] - Added notification to followers when a new version is approved.
[ADD] - Updated document_page_approval pot and added es translations.
[IMP] - document_page_approval: Updated spanish translation.

document_page_approval/data/email_template.xml

@@ -23,7 +23,7 @@
 
 <p>Have a great day.<br/>
 --<br/>
-OpenERP</p>]]>
+Odoo</p>]]>
             </field>
         </record>
 

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):

document_page_approval/document_page_view.xml

@@ -33,6 +33,22 @@
             <field name="model">document.page</field>
             <field name="inherit_id"
                    ref="document_page.view_wiki_form" />
+            <field name="arch" type="xml">
+                <field name="display_content"
+                       position="before">
+                    <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">
@@ -42,12 +58,19 @@
                         <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"
+                    <field name="approval_required"/>
-                           attrs="{'invisible':[('type','=','content')]}"/>
                     <field name="approver_gid"
-                           attrs="{'invisible':['|',('type','=','content'),
+                           attrs="{'invisible':[('approval_required','!=', True)], 'required':[('approval_required','=', True)]}"/>
-                        ('approval_required','!=', True)], 'required':[('approval_required','=', True)]}"/>
                 </field>
             </field>
         </record>

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"
+"POT-Creation-Date: 2015-07-27 20:53+0000\n"
-"PO-Revision-Date: 2013-07-19 03:58+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"
@@ -42,59 +26,12 @@ msgid "\n"
 "\n"
 "<p>Have a great day.<br/>\n"
 "--<br/>\n"
-"OpenERP</p>\n"
+"Odoo</p>\n"
 "            "
 msgstr ""
 
 #. module: document_page_approval
-#: model:ir.model,name:document_page_approval.model_document_page
+#: view:document.page.history:document_page_approval.wiki_history_form_inherit
-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
 msgid "Approve"
 msgstr ""
 
@@ -104,7 +41,52 @@ msgid "Approved"
 msgstr ""
 
 #. module: document_page_approval
-#: field:document.page.history,get_approvers_email:0
+#: field:document.page.history,approved_uid:0
-msgid "get all approvers email"
+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 ""

document_page_approval/i18n/es.po

@@ -0,0 +1,110 @@
+# 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-08-03 14:38+0200\n"
+"PO-Revision-Date: 2015-08-03 14:38+0200\n"
+"Last-Translator: Matjaz Mozetic <m.mozetic@matmoz.si>\n"
+"Language-Team: \n"
+"Language: es\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.8.2\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"
+"Odoo</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"
+"Odoo</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"

document_page_approval/i18n/es_CR.po

@@ -0,0 +1,110 @@
+# 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-08-03 14:38+0200\n"
+"PO-Revision-Date: 2015-08-03 14:38+0200\n"
+"Last-Translator: Matjaz Mozetic <m.mozetic@matmoz.si>\n"
+"Language-Team: \n"
+"Language: es_CR\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: \n"
+"X-Generator: Poedit 1.8.2\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"
+"Odoo</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"
+"Odoo</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"

document_page_approval/i18n/fr.po

@@ -1,39 +1,26 @@
-# 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"
+"POT-Creation-Date: 2015-07-30 14:19-0600\n"
-"PO-Revision-Date: 2013-07-19 03:58+0000\n"
+"PO-Revision-Date: 2015-08-03 13:36+0200\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: \n"
-
+"X-Generator: Poedit 1.8.2\n"
-#. module: document_page_approval
-#: field:document.page.history,state:0
-msgid "Status"
-msgstr "Statut"
-
-#. module: document_page_approval
-#: field:document.page,approval_required:0
-msgid "Require approval"
-msgstr "Nécessite une approbation"
-
-#. 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 "Approbation parente"
 
 #. module: document_page_approval
 #: model:email.template,body_html:document_page_approval.email_template_new_draft_need_approval
-msgid "\n"
+msgid ""
+"\n"
 "<p>Hello,</p>\n"
 "\n"
 "<p>The page \"${object.page_id.name}\" has been modified and need your approval.</p>\n"
@@ -42,9 +29,10 @@ msgid "\n"
 "\n"
 "<p>Have a great day.<br/>\n"
 "--<br/>\n"
-"OpenERP</p>\n"
+"Odoo</p>\n"
 "            "
-msgstr "\n"
+msgstr ""
+"\n"
 "<p>Bonjour,</p>\n"
 "\n"
 "<p>La page \"${object.page_id.name}\" a été modifié et demande votre approbation.</p>\n"
@@ -53,58 +41,11 @@ msgstr "\n"
 "\n"
 "<p>Bonne journée.<br/>\n"
 "--<br/>\n"
-"OpenERP</p>\n"
+"Odoo</p>\n"
 "            "
 
 #. module: document_page_approval
-#: model:ir.model,name:document_page_approval.model_document_page
+#: view:document.page.history:document_page_approval.wiki_history_form_inherit
-msgid "Document Page"
-msgstr "Page"
-
-#. module: document_page_approval
-#: field:document.page,approved_uid:0
-#: field:document.page.history,approved_uid:0
-msgid "Approved By"
-msgstr "Approuvée par"
-
-#. 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 "Nouvelle version de \"${object.page_id.name}\" à approuver"
-
-#. module: document_page_approval
-#: selection:document.page.history,state:0
-msgid "Draft"
-msgstr "Brouillon"
-
-#. module: document_page_approval
-#: field:document.page.history,get_page_url:0
-msgid "URL"
-msgstr "URL"
-
-#. module: document_page_approval
-#: field:document.page,approved_date:0
-#: field:document.page.history,approved_date:0
-msgid "Approved Date"
-msgstr "Date d'approbation"
-
-#. module: document_page_approval
-#: field:document.page.history,can_user_approve_page:0
-msgid "can user approve this page"
-msgstr "Est-ce que l'usager peut approuver cette page ?"
-
-#. module: document_page_approval
-#: field:document.page,approver_gid:0
-msgid "Approver group"
-msgstr "Groupe approbateur"
-
-#. module: document_page_approval
-#: model:ir.model,name:document_page_approval.model_document_page_history
-msgid "Document Page History"
-msgstr "Historique de la page"
-
-#. module: document_page_approval
-#: view:document.page.history:0
 msgid "Approve"
 msgstr "Approuver"
 
@@ -114,6 +55,52 @@ msgid "Approved"
 msgstr "Approuvée"
 
 #. module: document_page_approval
-#: field:document.page.history,get_approvers_email:0
+#: field:document.page.history,approved_uid:0
-msgid "get all approvers email"
+msgid "Approved By"
-msgstr "Récupérer toutes les adresses courriels des approbateurs"
+msgstr "Approuvée par"
+
+#. module: document_page_approval
+#: field:document.page.history,approved_date:0
+msgid "Approved Date"
+msgstr "Date d'approbation"
+
+#. module: document_page_approval
+#: field:document.page,approver_gid:0
+msgid "Approver group"
+msgstr "Groupe approbateur"
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page
+msgid "Document Page"
+msgstr "Page"
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page_history
+msgid "Document Page History"
+msgstr "Historique de la page"
+
+#. module: document_page_approval
+#: selection:document.page.history,state:0
+msgid "Draft"
+msgstr "Brouillon"
+
+#. 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 "Nouvelle version de \"${object.page_id.name}\" à approuver"
+
+#. 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 "Nécessite une approbation"
+
+#. module: document_page_approval
+#: field:document.page.history,state:0
+msgid "Status"
+msgstr "Statut"

document_page_approval/i18n/sl.po

@@ -1,38 +1,21 @@
-# Translation of OpenERP Server.
+# Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # 	* document_page_approval
 #
-# Matjaž Mozetič <m.mozetic@matmoz.si>, 2015.
 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"
+"POT-Creation-Date: 2015-07-30 14:20-0600\n"
-"PO-Revision-Date: 2015-04-13 07:38+0200\n"
+"PO-Revision-Date: 2015-08-03 13:36+0200\n"
-"Last-Translator: Matjaž Mozetič <m.mozetic@matmoz.si>\n"
+"Last-Translator: Matjaz Mozetic <m.mozetic@matmoz.si>\n"
 "Language-Team: Slovenian <translate@matmoz.si>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: \n"
+"Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: \n"
-"Language: sl\n"
+"X-Generator: Poedit 1.8.2\n"
-"X-Generator: Lokalize 1.5\n"
-
-#. module: document_page_approval
-#: field:document.page.history,state:0
-msgid "Status"
-msgstr "Status"
-
-#. module: document_page_approval
-#: field:document.page,approval_required:0
-msgid "Require approval"
-msgstr "Zahtevana odobritev"
-
-#. 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 "Nadrejena odobritev"
 
 #. module: document_page_approval
 #: model:email.template,body_html:document_page_approval.email_template_new_draft_need_approval
@@ -40,80 +23,29 @@ msgid ""
 "\n"
 "<p>Hello,</p>\n"
 "\n"
-"<p>The page \"${object.page_id.name}\" has been modified and need your "
+"<p>The page \"${object.page_id.name}\" has been modified and need your approval.</p>\n"
-"approval.</p>\n"
 "\n"
-"<p>You can review the new version here : <a href=\"${object.get_page_url}\">"
+"<p>You can review the new version here : <a href=\"${object.get_page_url}\">${object.get_page_url}</a></p>\n"
-"${object.get_page_url}</a></p>\n"
 "\n"
 "<p>Have a great day.<br/>\n"
 "--<br/>\n"
-"OpenERP</p>\n"
+"Odoo</p>\n"
 "            "
 msgstr ""
 "\n"
 "<p>Pozdravljeni,</p>\n"
 "\n"
-"<p>Stran \"${object.page_id.name}\" vsebuje spremembe, ki potrebujejo vašo "
+"<p>Stran \"${object.page_id.name}\" vsebuje spremembe, ki potrebujejo vašo odobritev.</p>\n"
-"odobritev.</p>\n"
 "\n"
-"<p>Novo različico lahko pregledate tukaj: <a href=\"${object.get_page_url}\">"
+"<p>Novo različico lahko pregledate tukaj: <a href=\"${object.get_page_url}\">${object.get_page_url}</a></p>\n"
-"${object.get_page_url}</a></p>\n"
 "\n"
 "<p>Lep dan.<br/>\n"
 "--<br/>\n"
-"OpenERP</p>\n"
+"Odoo</p>\n"
 "            "
 
 #. module: document_page_approval
-#: model:ir.model,name:document_page_approval.model_document_page
+#: view:document.page.history:document_page_approval.wiki_history_form_inherit
-msgid "Document Page"
-msgstr "Stran dokumenta"
-
-#. module: document_page_approval
-#: field:document.page,approved_uid:0
-#: field:document.page.history,approved_uid:0
-msgid "Approved By"
-msgstr "Odobril"
-
-#. 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 "Nova različica \"${object.page_id.name}\" za odobritev"
-
-#. module: document_page_approval
-#: selection:document.page.history,state:0
-msgid "Draft"
-msgstr "Osnutek"
-
-#. module: document_page_approval
-#: field:document.page.history,get_page_url:0
-msgid "URL"
-msgstr "URL povezava"
-
-#. module: document_page_approval
-#: field:document.page,approved_date:0
-#: field:document.page.history,approved_date:0
-msgid "Approved Date"
-msgstr "Datum odobritve"
-
-#. module: document_page_approval
-#: field:document.page.history,can_user_approve_page:0
-msgid "can user approve this page"
-msgstr "uporabnik lahko odobri to stran"
-
-#. module: document_page_approval
-#: field:document.page,approver_gid:0
-msgid "Approver group"
-msgstr "Skupina pooblaščenih za odobritev"
-
-#. module: document_page_approval
-#: model:ir.model,name:document_page_approval.model_document_page_history
-msgid "Document Page History"
-msgstr "Zgodovina strani dokumentov"
-
-#. module: document_page_approval
-#: view:document.page.history:0
 msgid "Approve"
 msgstr "Odobri"
 
@@ -123,8 +55,52 @@ msgid "Approved"
 msgstr "Odobreno"
 
 #. module: document_page_approval
-#: field:document.page.history,get_approvers_email:0
+#: field:document.page.history,approved_uid:0
-msgid "get all approvers email"
+msgid "Approved By"
-msgstr "pridobi vse e-poštne naslove pooblaščenih za odobritve "
+msgstr "Odobril"
 
+#. module: document_page_approval
+#: field:document.page.history,approved_date:0
+msgid "Approved Date"
+msgstr "Datum odobritve"
 
+#. module: document_page_approval
+#: field:document.page,approver_gid:0
+msgid "Approver group"
+msgstr "Skupina pooblaščenih za odobritev"
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page
+msgid "Document Page"
+msgstr "Stran dokumenta"
+
+#. module: document_page_approval
+#: model:ir.model,name:document_page_approval.model_document_page_history
+msgid "Document Page History"
+msgstr "Zgodovina strani dokumentov"
+
+#. module: document_page_approval
+#: selection:document.page.history,state:0
+msgid "Draft"
+msgstr "Osnutek"
+
+#. 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 "Nova različica \"${object.page_id.name}\" za odobritev"
+
+#. 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 "Nova verzija dokumenta %s odobrena."
+
+#. module: document_page_approval
+#: field:document.page,approval_required:0
+msgid "Require approval"
+msgstr "Zahtevana odobritev"
+
+#. module: document_page_approval
+#: field:document.page.history,state:0
+msgid "Status"
+msgstr "Status"