diff --git a/attachment_preview/README.rst b/attachment_preview/README.rst
index 197d487f25a..28f8ea5c135 100644
--- a/attachment_preview/README.rst
+++ b/attachment_preview/README.rst
@@ -29,6 +29,10 @@ This addon allows to preview attachments supported by http://viewerjs.org.
 
 Currently, that's most Libreoffice files and PDFs.
 
+.. image:: /attachment_preview/static/description/screenshot-split.png
+   :alt: Screenshot of split form view
+   :width: 100%
+
 **Table of contents**
 
 .. contents::
@@ -46,7 +50,13 @@ Usage
 =====
 
 The module adds a little print preview icon right of download links for
-attachments or binary fields.
+attachments or binary fields. When a preview is opened from the attachments
+menu it's shown next to the form view. From this screen you can navigate
+through the attachments using the arrow buttons. Using the pop-out button
+next to the navigational buttons you can open the preview in a separate window.
+
+.. image:: /attachment_preview/static/description/screenshot-paginator.png
+   :alt: Screenshot navigator
 
 Bug Tracker
 ===========
diff --git a/attachment_preview/__manifest__.py b/attachment_preview/__manifest__.py
index 7020cd32f9d..77da9c13888 100644
--- a/attachment_preview/__manifest__.py
+++ b/attachment_preview/__manifest__.py
@@ -3,7 +3,7 @@
 
 {
     "name": "Preview attachments",
-    "version": "11.0.1.2.0",
+    "version": "11.0.1.3.0",
     "author": "Therp BV,"
               "Onestein,"
               "Odoo Community Association (OCA)",
diff --git a/attachment_preview/models/ir_attachment.py b/attachment_preview/models/ir_attachment.py
index e1beaf555a5..0b88b0e771c 100644
--- a/attachment_preview/models/ir_attachment.py
+++ b/attachment_preview/models/ir_attachment.py
@@ -41,7 +41,7 @@ def get_binary_extension(self, model, ids, binary_field,
         ids_to_browse = [_id for _id in ids_to_browse if _id not in result]
         for this in self.env[model].with_context(
                 bin_size=True).browse(ids_to_browse):
-            if this[binary_field] is None:
+            if not this[binary_field]:
                 result[this.id] = False
                 continue
             try:
diff --git a/attachment_preview/readme/DESCRIPTION.rst b/attachment_preview/readme/DESCRIPTION.rst
index f1b31ab8736..aadfd9448b0 100644
--- a/attachment_preview/readme/DESCRIPTION.rst
+++ b/attachment_preview/readme/DESCRIPTION.rst
@@ -1,3 +1,7 @@
 This addon allows to preview attachments supported by http://viewerjs.org.
 
 Currently, that's most Libreoffice files and PDFs.
+
+.. image:: /attachment_preview/static/description/screenshot-split.png
+   :alt: Screenshot of split form view
+   :width: 100%
diff --git a/attachment_preview/readme/USAGE.rst b/attachment_preview/readme/USAGE.rst
index e1783956d82..941a680c529 100644
--- a/attachment_preview/readme/USAGE.rst
+++ b/attachment_preview/readme/USAGE.rst
@@ -1,2 +1,8 @@
 The module adds a little print preview icon right of download links for
-attachments or binary fields.
+attachments or binary fields. When a preview is opened from the attachments
+menu it's shown next to the form view. From this screen you can navigate
+through the attachments using the arrow buttons. Using the pop-out button
+next to the navigational buttons you can open the preview in a separate window.
+
+.. image:: /attachment_preview/static/description/screenshot-paginator.png
+   :alt: Screenshot navigator
diff --git a/attachment_preview/static/description/screenshot-paginator.png b/attachment_preview/static/description/screenshot-paginator.png
new file mode 100644
index 00000000000..02910c83c40
Binary files /dev/null and b/attachment_preview/static/description/screenshot-paginator.png differ
diff --git a/attachment_preview/static/description/screenshot-split.png b/attachment_preview/static/description/screenshot-split.png
new file mode 100644
index 00000000000..257952bf19e
Binary files /dev/null and b/attachment_preview/static/description/screenshot-split.png differ
diff --git a/attachment_preview/static/src/css/attachment_preview.css b/attachment_preview/static/src/css/attachment_preview.css
deleted file mode 100644
index d94ff0e00ce..00000000000
--- a/attachment_preview/static/src/css/attachment_preview.css
+++ /dev/null
@@ -1,15 +0,0 @@
-.o_cp_sidebar li .o_sidebar_preview_attachment {
-    position: absolute;
-    top: 5px;
-    right: 26px;
-    background-color: #FFF;
-}
-
-.o_cp_sidebar .open .dropdown-menu > li > a {
-    padding-right: 46px;
-}
-
-.o_form_uri .fa-search {
-    padding-left: 5px;
-    padding-right: 5px;
-}
diff --git a/attachment_preview/static/src/js/attachment_preview.js b/attachment_preview/static/src/js/attachment_preview.js
index fee97da2434..3f1f6604fa6 100644
--- a/attachment_preview/static/src/js/attachment_preview.js
+++ b/attachment_preview/static/src/js/attachment_preview.js
@@ -6,8 +6,12 @@ odoo.define('attachment_preview', function(require) {
 
     var core = require('web.core');
     var _t = core._t;
+    var qweb = core.qweb;
     var Sidebar = require('web.Sidebar');
     var basic_fields = require('web.basic_fields');
+    var FormRenderer = require('web.FormRenderer');
+    var FormController = require('web.FormController');
+    var Widget = require('web.Widget');
 
     var AttachmentPreviewMixin = {
         canPreview: function(extension) {
@@ -18,68 +22,126 @@ odoo.define('attachment_preview', function(require) {
                     'fods', 'ots'
                 ]) > -1;
         },
-        showPreview: function(attachment_id, attachment_url, attachment_extension, attachment_title) {
+
+        getUrl: function(attachment_id, attachment_url, attachment_extension, attachment_title) {
             var url = (window.location.origin || '') +
                 '/attachment_preview/static/lib/ViewerJS/index.html' +
                 '?type=' + encodeURIComponent(attachment_extension) +
                 '&title=' + encodeURIComponent(attachment_title) +
                 '#' +
                 attachment_url.replace(window.location.origin, '');
-            window.open(url);
-        }
+            return url;
+        },
+
+        showPreview: function(attachment_id, attachment_url, attachment_extension, attachment_title, split_screen) {
+            var url = this.getUrl(attachment_id, attachment_url, attachment_extension, attachment_title);
+            if (split_screen) {
+                this.trigger_up('onAttachmentPreview', {url: url});
+            } else {
+                window.open(url);
+            }
+        },
     };
 
     Sidebar.include(AttachmentPreviewMixin);
     Sidebar.include({
+        events: _.extend({}, Sidebar.prototype.events, {
+            'click .o_sidebar_preview_attachment': '_onPreviewAttachment'
+        }),
+
+        previewableAttachments: null,
+
         _redraw: function () {
             this._super.apply(this, arguments);
-            this.$('.o_sidebar_preview_attachment')
-                .click(this._onPreviewAttachment.bind(this));
-            this.updatePreviewButtons();
+            this.getPreviewableAttachments().done(function(atts) {
+                this.previewableAttachments = atts;
+                this.updatePreviewButtons(atts);
+                this.trigger_up('setPreviewableAttachments', {attachments: atts});
+            }.bind(this));
         },
+
         _onPreviewAttachment: function(event) {
             event.preventDefault();
             var self = this,
                 $target = $(event.currentTarget),
+                split_screen = $target.attr('data-target') != 'new',
                 attachment_id = parseInt($target.attr('data-id'), 10),
                 attachment_url = $target.attr('data-url'),
                 attachment_extension = $target.attr('data-extension'),
                 attachment_title = $target.attr('data-original-title');
 
             if(attachment_extension) {
-                this.showPreview(attachment_id, attachment_url, attachment_extension, attachment_title);
+                this.showPreview(attachment_id, attachment_url, attachment_extension, attachment_title, split_screen);
             } else {
                 this._rpc({
                     model: 'ir.attachment',
                     method: 'get_attachment_extension',
                     args: [attachment_id]
                 }).then(function(extension) {
-                    self.showPreview(attachment_id, attachment_url, extension);
+                    self.showPreview(attachment_id, attachment_url, extension, null, split_screen);
                 });
             }
         },
-        updatePreviewButtons: function() {
+
+        getPreviewableAttachments: function() {
             var self = this;
-            return this._rpc({
+            var deferred = $.Deferred();
+
+            var $items = this.$el.find('.o_sidebar_preview_attachment');
+            var attachments = _.object($items.map(function() {
+                return parseInt($(this).attr('data-id'), 10);
+            }), $items.map(function() {
+                return {
+                    url: $(this).attr('data-url'),
+                    extension: $(this).attr('data-extension'),
+                    title: $(this).attr('data-original-title'),
+                };
+            }));
+
+            this._rpc({
                 model: 'ir.attachment',
                 method: 'get_attachment_extension',
                 args: [
-                    this.$el.find('.o_sidebar_preview_attachment').map(function() {
-                        return parseInt($(this).attr('data-id'), 10);
-                    }).get()
+                    _.map(_.keys(attachments), function(id) {
+                        return parseInt(id, 10);
+                    })
                 ]
             }).then(function(extensions) {
-                _(extensions).each(function(extension, id) {
-                    var $element = self.$el.find('span.o_sidebar_preview_attachment[data-id="' + id + '"]');
-                    if (self.canPreview(extension)) {
-                        $element.attr('data-extension', extension);
-                    } else {
-                        $element.remove();
+                var reviewableAttachments = _.map(_.keys(_.pick(extensions, function(extension, id) {
+                    return self.canPreview(extension);
+                })), function(id) {
+                    return {
+                        id: id,
+                        url: attachments[id]['url'],
+                        extension: extensions[id],
+                        title: attachments[id]['title'],
+                        previewUrl: self.getUrl(
+                            id,
+                            attachments[id]['url'],
+                            extensions[id],
+                            id + ' - ' + attachments[id]['title']
+                        )
                     }
                 });
+                deferred.resolve(reviewableAttachments);
+            }, function() {
+                deferred.reject();
             });
+            return deferred.promise();
         },
 
+        updatePreviewButtons: function(previewableAttachments) {
+            this.$el.find('.o_sidebar_preview_attachment').each(function() {
+                var $this = $(this);
+                var id = $this.attr('data-id');
+                var att = _.findWhere(previewableAttachments, {id: id});
+                if (att) {
+                    $this.attr('data-extension', att.extension);
+                } else {
+                    $this.remove();
+                }
+            });
+        },
     });
 
     basic_fields.FieldBinaryFile.include(AttachmentPreviewMixin);
@@ -87,6 +149,7 @@ odoo.define('attachment_preview', function(require) {
         events: _.extend({}, basic_fields.FieldBinaryFile.prototype.events, {
             'click .fa-search': '_onPreview'
         }),
+
         _renderReadonly: function () {
             var self = this;
             this._super.apply(this, arguments);
@@ -96,6 +159,7 @@ odoo.define('attachment_preview', function(require) {
                 }
             });
         },
+
         _renderPreviewButton: function(extension) {
             this.$previewBtn = $("<span/>");
             this.$previewBtn.addClass('fa fa-search');
@@ -103,6 +167,7 @@ odoo.define('attachment_preview', function(require) {
             this.$previewBtn.attr('data-extension', extension);
             this.$el.find('.fa-download').after(this.$previewBtn);
         },
+
         _getBinaryExtension: function () {
             return this._rpc({
                 model: 'ir.attachment',
@@ -115,6 +180,7 @@ odoo.define('attachment_preview', function(require) {
                 ]
             });
         },
+
         _onPreview: function(event) {
             this.showPreview(
                 null,
@@ -125,12 +191,158 @@ odoo.define('attachment_preview', function(require) {
                     this.recordData.id
                 ),
                 $(event.currentTarget).attr('data-extension'),
-                _.str.sprintf(_t('Preview %s'), this.field.string)
+                _.str.sprintf(_t('Preview %s'), this.field.string),
+                false
+            );
+        }
+    });
+
+    var AttachmentPreviewWidget = Widget.extend({
+        template: 'attachment_preview.AttachmentPreviewWidget',
+        activeIndex: 0,
+        attachments: null,
+
+        events: {
+            'click .attachment_preview_close': '_onCloseClick',
+            'click .attachment_preview_previous': '_onPreviousClick',
+            'click .attachment_preview_next': '_onNextClick',
+            'click .attachment_preview_popout': '_onPopoutClick',
+        },
+
+        start: function () {
+            var res = this._super.apply(this, arguments);
+            this.$overlay = this.$el.find('.attachment_preview_overlay');
+            this.$iframe = this.$el.find('.attachment_preview_iframe');
+            this.$current = this.$el.find('.attachment_preview_current');
+            return res;
+        },
+
+        _onCloseClick: function () {
+            this.hide();
+        },
+
+        _onPreviousClick: function () {
+            this.previous();
+        },
+
+        _onNextClick: function () {
+            this.next();
+        },
+
+        _onPopoutClick: function () {
+            if (!this.attachments[this.activeIndex]) {
+                return;
+            }
+
+            window.open(this.attachments[this.activeIndex].previewUrl);
+        },
+
+        next: function() {
+            var index = this.activeIndex + 1;
+            if (index >= this.attachments.length) {
+                index = 0;
+            }
+            this.activeIndex = index;
+            this.updatePaginator();
+            this.loadPreview();
+        },
+
+        previous: function() {
+            var index = this.activeIndex - 1;
+            if (index < 0) {
+                index = this.attachments.length - 1;
+            }
+            this.activeIndex = index;
+            this.updatePaginator();
+            this.loadPreview();
+        },
+
+        show: function () {
+            this.$el.removeClass('hidden');
+            this.trigger('shown');
+        },
+
+        hide: function () {
+            this.$el.addClass('hidden');
+            this.trigger('hidden');
+        },
+
+        updatePaginator: function() {
+            var value = _.str.sprintf('%s / %s', this.activeIndex + 1, this.attachments.length);
+            this.$current.html(value);
+        },
+
+        loadPreview: function() {
+            if (this.attachments.length == 0) {
+                this.$iframe.attr('src', 'about:blank');
+                return;
+            }
+
+            var att = this.attachments[this.activeIndex];
+            this.$iframe.attr('src', att.previewUrl);
+        },
+
+        setAttachments: function(attachments) {
+            this.attachments = attachments;
+            this.activeIndex = 0;
+            this.updatePaginator();
+            this.loadPreview();
+        }
+    });
+
+    FormRenderer.include({
+        attachmentPreviewWidget: null,
+
+        init: function() {
+            var res = this._super.apply(this, arguments);
+            this.attachmentPreviewWidget = new AttachmentPreviewWidget(this);
+            this.attachmentPreviewWidget.on('hidden', this, this._attachmentPreviewWidgetHidden);
+            return res;
+        },
+
+        start: function () {
+            this._super.apply(this, arguments);
+            this.attachmentPreviewWidget.insertAfter(this.$el);
+        },
+
+        _attachmentPreviewWidgetHidden: function() {
+            this.$el.removeClass('attachment_preview');
+        },
+
+        showAttachmentPreviewWidget: function () {
+            this.$el.addClass('attachment_preview');
+            this.attachmentPreviewWidget.setAttachments(
+                this.getParent().sidebar.previewableAttachments
+            );
+            this.attachmentPreviewWidget.show();
+        },
+
+        on_detach_callback: function () {
+            this.attachmentPreviewWidget.hide();
+            return this._super.apply(this, arguments);
+        }
+
+    });
+
+    FormController.include({
+        custom_events: _.extend({}, FormController.prototype.custom_events, {
+            onAttachmentPreview: '_onAttachmentPreview',
+            setPreviewableAttachments: '_setPreviewableAttachments'
+        }),
+
+        _onAttachmentPreview: function (event) {
+            this.renderer.showAttachmentPreviewWidget();
+        },
+
+        _setPreviewableAttachments: function(event) {
+            this.renderer.attachmentPreviewWidget.setAttachments(
+                event.data.attachments
             );
         }
     });
 
     return {
-        AttachmentPreviewMixin: AttachmentPreviewMixin
+        AttachmentPreviewMixin: AttachmentPreviewMixin,
+        AttachmentPreviewWidget: AttachmentPreviewWidget
     };
 });
diff --git a/attachment_preview/static/src/less/attachment_preview.less b/attachment_preview/static/src/less/attachment_preview.less
new file mode 100644
index 00000000000..17c42ac1665
--- /dev/null
+++ b/attachment_preview/static/src/less/attachment_preview.less
@@ -0,0 +1,56 @@
+.o_cp_sidebar {
+    li .o_sidebar_preview_attachment {
+        position: absolute;
+        top: 5px;
+        right: 26px;
+        background-color: #FFF;
+
+        &.o_sidebar_preview_attachment_new_tab {
+            right: 43px;
+        }
+    }
+
+    .open .dropdown-menu > li > a {
+        padding-right: 60px;
+    }
+}
+
+.o_form_uri .fa-search {
+    padding-left: 5px;
+    padding-right: 5px;
+}
+
+/* Preview widget */
+
+.o_form_view.attachment_preview {
+    width: 60%;
+    float: left;
+}
+
+.o_form_view + .attachment_preview_widget {
+    width: 40%;
+    height: 100%;
+    float: right;
+    position: relative;
+
+    > .attachment_preview_iframe {
+        width: 100%;
+        height: calc(~"100% - 30px");
+        float: left;
+    }
+
+    .attachment_preview_buttons {
+        padding: 4px;
+        float: left;
+        width: 100%;
+        background-color: #FFF;
+        border-left: 1px solid @gray-lighter-dark;
+
+        button {
+            min-width: 25px;
+            min-height: 25px;
+            padding-top: 2px;
+            padding-bottom: 2px;
+        }
+    }
+}
diff --git a/attachment_preview/static/src/xml/attachment_preview.xml b/attachment_preview/static/src/xml/attachment_preview.xml
index e110f52c860..fd2a9665723 100644
--- a/attachment_preview/static/src/xml/attachment_preview.xml
+++ b/attachment_preview/static/src/xml/attachment_preview.xml
@@ -7,6 +7,29 @@
                   t-att-data-id="item.id"
                   t-att-data-url="item.url"
                   t-attf-title="Preview #{item.name}"/>
+
+            <span t-if="section.name == 'files' and widget.options.editable and !item.callback and item.url"
+                  class="fa fa-external-link o_sidebar_preview_attachment o_sidebar_preview_attachment_new_tab"
+                  data-target="new"
+                  t-att-data-id="item.id"
+                  t-att-data-url="item.url"
+                  t-attf-title="Open preview #{item.name} in a new tab"/>
         </t>
     </t>
+
+    <t t-name="attachment_preview.AttachmentPreviewWidget">
+        <div class="attachment_preview_widget hidden">
+            <div class="attachment_preview_buttons">
+                <div class="button-group pull-left">
+                    <button class="btn btn-sm btn-default attachment_preview_previous"><i class="fa fa-chevron-left"/></button>
+                    <button class="btn btn-sm btn-default disabled attachment_preview_current">1 / 5</button>
+                    <button class="btn btn-sm btn-default attachment_preview_next"><i class="fa fa-chevron-right"/></button>
+                </div>
+                <button class="btn btn-sm btn-default pull-left ml8 attachment_preview_popout"><i class="fa fa-external-link"/></button>
+
+                <button class="btn btn-sm btn-default pull-right attachment_preview_close"><i class="fa fa-times"/></button>
+            </div>
+            <iframe class="attachment_preview_iframe"></iframe>
+        </div>
+    </t>
 </templates>
diff --git a/attachment_preview/templates/assets.xml b/attachment_preview/templates/assets.xml
index 1b94f3e90b4..8caf8f95382 100644
--- a/attachment_preview/templates/assets.xml
+++ b/attachment_preview/templates/assets.xml
@@ -3,7 +3,7 @@
     <template id="assets_backend" name="attachment_preview assets" inherit_id="web.assets_backend">
         <xpath expr="." position="inside">
             <script type="text/javascript" src="/attachment_preview/static/src/js/attachment_preview.js"></script>
-            <link rel="stylesheet" type="text/css" href="/attachment_preview/static/src/css/attachment_preview.css" />
+            <link rel="stylesheet" type="text/less" href="/attachment_preview/static/src/less/attachment_preview.less" />
         </xpath>
     </template>
 </odoo>
diff --git a/document_page/i18n/am.po b/document_page/i18n/am.po
index 3329d3e494e..834974f55c0 100644
--- a/document_page/i18n/am.po
+++ b/document_page/i18n/am.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/ar.po b/document_page/i18n/ar.po
index 9ac0868b33f..efb31e2d9c4 100644
--- a/document_page/i18n/ar.po
+++ b/document_page/i18n/ar.po
@@ -19,6 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
 "&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "أنشئ في"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "المعرف"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/bg.po b/document_page/i18n/bg.po
index 03cc7153e09..5bf98213347 100644
--- a/document_page/i18n/bg.po
+++ b/document_page/i18n/bg.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Създадено на"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/bs.po b/document_page/i18n/bs.po
index 013bf9b5d5e..eb177b48491 100644
--- a/document_page/i18n/bs.po
+++ b/document_page/i18n/bs.po
@@ -19,6 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Kreirano"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/ca.po b/document_page/i18n/ca.po
index 324504f42b2..d9cc87e0b51 100644
--- a/document_page/i18n/ca.po
+++ b/document_page/i18n/ca.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Creat el"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/cs.po b/document_page/i18n/cs.po
index 1b7b35dabdb..afceaf0c206 100644
--- a/document_page/i18n/cs.po
+++ b/document_page/i18n/cs.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Vytvořeno"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/da.po b/document_page/i18n/da.po
index de0e5d49e63..2b268e1d697 100644
--- a/document_page/i18n/da.po
+++ b/document_page/i18n/da.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Oprettet den"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "Id"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/de.po b/document_page/i18n/de.po
index 06e6e570f07..39e814dd890 100644
--- a/document_page/i18n/de.po
+++ b/document_page/i18n/de.po
@@ -20,6 +20,11 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 "X-Generator: Weblate 3.1.1\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -67,6 +72,12 @@ msgstr "Klicke hier um eine neue Seite zu erstellen."
 msgid "Close"
 msgstr "Schließen"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -101,7 +112,7 @@ msgid "Created on"
 msgstr "Erstellt am"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -184,6 +195,12 @@ msgstr "Verlauf"
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -240,12 +257,19 @@ msgid "Menu Name"
 msgstr "Menü Name"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr "Name"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -283,6 +307,17 @@ msgstr "Verlauf der Seiten"
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -290,8 +325,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr "Wähle eine oder maximal zwei Verlaufrevisionen!"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr "Zusammenfassung"
 
@@ -309,7 +344,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/el.po b/document_page/i18n/el.po
index ce091b25e32..074b05dae5d 100644
--- a/document_page/i18n/el.po
+++ b/document_page/i18n/el.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Δημιουργήθηκε στις"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "Κωδικός"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/el_GR.po b/document_page/i18n/el_GR.po
index 10cf8d4dfa9..bdd4e02117c 100644
--- a/document_page/i18n/el_GR.po
+++ b/document_page/i18n/el_GR.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Δημιουργήθηκε στις"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "Κωδικός"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/en.po b/document_page/i18n/en.po
index 9a9ee46b914..dbc9e5c7965 100644
--- a/document_page/i18n/en.po
+++ b/document_page/i18n/en.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr "Click to create a new web page."
 msgid "Close"
 msgstr "Close"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Created on"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr "History"
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 #, fuzzy
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr "Menu Name"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr "Name"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr "Pages history"
 msgid "Parent Menu"
 msgstr "Parent Menu"
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr "Select one or maximum two history revisions!"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr "Summary"
 
@@ -310,7 +345,7 @@ msgstr ""
 "category."
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr "There are no changes in revisions."
diff --git a/document_page/i18n/en_AU.po b/document_page/i18n/en_AU.po
index c0ff806a45c..cbef47e27ce 100644
--- a/document_page/i18n/en_AU.po
+++ b/document_page/i18n/en_AU.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/en_GB.po b/document_page/i18n/en_GB.po
index f2d71430947..3eea7f2baea 100644
--- a/document_page/i18n/en_GB.po
+++ b/document_page/i18n/en_GB.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Created on"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/es.po b/document_page/i18n/es.po
index 275c84b969f..03bd5e8e3a2 100644
--- a/document_page/i18n/es.po
+++ b/document_page/i18n/es.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr "Pulse para crear una nueva página web."
 msgid "Close"
 msgstr "Cerrar"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Creado el"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr "Historial"
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr "Nombre del menú"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr "Nombre"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr "Historial de las páginas"
 msgid "Parent Menu"
 msgstr "Menú superior"
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr "Resumen"
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/es_AR.po b/document_page/i18n/es_AR.po
index acb3626a75a..7fab3621865 100644
--- a/document_page/i18n/es_AR.po
+++ b/document_page/i18n/es_AR.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/es_CL.po b/document_page/i18n/es_CL.po
index fe8bcc2553a..ea02fca3c23 100644
--- a/document_page/i18n/es_CL.po
+++ b/document_page/i18n/es_CL.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/es_CO.po b/document_page/i18n/es_CO.po
index 61db62de6e9..104a935f3a7 100644
--- a/document_page/i18n/es_CO.po
+++ b/document_page/i18n/es_CO.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/es_CR.po b/document_page/i18n/es_CR.po
index 53a065c7967..5f931142f72 100644
--- a/document_page/i18n/es_CR.po
+++ b/document_page/i18n/es_CR.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/es_DO.po b/document_page/i18n/es_DO.po
index 5b85099e936..3c55fcfae49 100644
--- a/document_page/i18n/es_DO.po
+++ b/document_page/i18n/es_DO.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID (identificación)"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/es_EC.po b/document_page/i18n/es_EC.po
index e995118e2d8..e91ec0b7a8c 100644
--- a/document_page/i18n/es_EC.po
+++ b/document_page/i18n/es_EC.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/es_ES.po b/document_page/i18n/es_ES.po
index 6ed286d0ec4..c17e0982f3b 100644
--- a/document_page/i18n/es_ES.po
+++ b/document_page/i18n/es_ES.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/es_MX.po b/document_page/i18n/es_MX.po
index 69b4d3cbf92..d25909590b1 100644
--- a/document_page/i18n/es_MX.po
+++ b/document_page/i18n/es_MX.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/es_PY.po b/document_page/i18n/es_PY.po
index 2b1b861aa6b..0eb124aee40 100644
--- a/document_page/i18n/es_PY.po
+++ b/document_page/i18n/es_PY.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/es_VE.po b/document_page/i18n/es_VE.po
index 5a04c7fc503..cca2b72648f 100644
--- a/document_page/i18n/es_VE.po
+++ b/document_page/i18n/es_VE.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Creado en"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/et.po b/document_page/i18n/et.po
index d0ac8c4d633..cbd81eb6c88 100644
--- a/document_page/i18n/et.po
+++ b/document_page/i18n/et.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Loodud"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/eu.po b/document_page/i18n/eu.po
index c67e45ff76c..7b54b8035aa 100644
--- a/document_page/i18n/eu.po
+++ b/document_page/i18n/eu.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/fa.po b/document_page/i18n/fa.po
index 48226cb3e03..19e225dde90 100644
--- a/document_page/i18n/fa.po
+++ b/document_page/i18n/fa.po
@@ -19,6 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=1; plural=0;\n"
 "X-Generator: Weblate 3.0.1\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "ایجاد شده در"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr "تاریخچه"
 msgid "ID"
 msgstr "شناسه"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr "نام منو"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr "نام"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr "خلاصه"
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/fi.po b/document_page/i18n/fi.po
index 441ca23e4de..cb41c7b3613 100644
--- a/document_page/i18n/fi.po
+++ b/document_page/i18n/fi.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Luotu"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/fr.po b/document_page/i18n/fr.po
index 5715535d829..4fa1ad78ef2 100644
--- a/document_page/i18n/fr.po
+++ b/document_page/i18n/fr.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr "Cliquer pour créer une nouvelle page Web"
 msgid "Close"
 msgstr "Fermer"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Créé le"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr "Décrivez les modifications réalisées"
 
@@ -183,6 +194,12 @@ msgstr "Historique"
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,20 @@ msgid "Menu Name"
 msgstr "Nom du menu"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr "Nom"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+#, fuzzy
+msgid "Name for the changes made"
+msgstr "Décrivez les modifications réalisées"
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +307,17 @@ msgstr "Historique des pages"
 msgid "Parent Menu"
 msgstr "Menu parent"
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +325,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr "Sélectionnez une révision ou deux maximum!"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr "Résumé"
 
@@ -310,7 +346,7 @@ msgstr ""
 "cette catégorie."
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr "Il n'y a pas de différence entre ces révisions."
diff --git a/document_page/i18n/fr_CA.po b/document_page/i18n/fr_CA.po
index 5b52770cbfd..f8fe54e59a2 100644
--- a/document_page/i18n/fr_CA.po
+++ b/document_page/i18n/fr_CA.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Créé le"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "Identifiant"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/gl.po b/document_page/i18n/gl.po
index b9f3cfc02dc..ab727e60d46 100644
--- a/document_page/i18n/gl.po
+++ b/document_page/i18n/gl.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Creado o"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/gu.po b/document_page/i18n/gu.po
index 3db73ecca23..e706d3e8e6c 100644
--- a/document_page/i18n/gu.po
+++ b/document_page/i18n/gu.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ઓળખ"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/he.po b/document_page/i18n/he.po
index f1777c6eb65..97b97479a79 100644
--- a/document_page/i18n/he.po
+++ b/document_page/i18n/he.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "נוצר ב-"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "מזהה"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/hi.po b/document_page/i18n/hi.po
index 7eea9cf1d47..b1cc691bec6 100644
--- a/document_page/i18n/hi.po
+++ b/document_page/i18n/hi.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/hr.po b/document_page/i18n/hr.po
index bd95eea2eb6..23284830f23 100644
--- a/document_page/i18n/hr.po
+++ b/document_page/i18n/hr.po
@@ -20,6 +20,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -67,6 +72,12 @@ msgstr "Kliknite za stvaranje nove webstranice"
 msgid "Close"
 msgstr "Zatvori"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -101,7 +112,7 @@ msgid "Created on"
 msgstr "Vrijeme kreiranja"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -184,6 +195,12 @@ msgstr "Povijest"
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -240,12 +257,19 @@ msgid "Menu Name"
 msgstr "Naziv izbornika"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr "Naziv"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -283,6 +307,17 @@ msgstr "Povijest stranica"
 msgid "Parent Menu"
 msgstr "Nadređeni izbornik"
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -290,8 +325,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr "Odaberite jednu do max. dvije revizije!"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr "Sažetak"
 
@@ -311,7 +346,7 @@ msgstr ""
 "nove stranice u ovoj kategoriji."
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr "Nema izmjena u ovoj reviziji"
diff --git a/document_page/i18n/hu.po b/document_page/i18n/hu.po
index f9da4d4a5cd..f20c510489b 100644
--- a/document_page/i18n/hu.po
+++ b/document_page/i18n/hu.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Létrehozás dátuma"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "Azonosító ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/hy.po b/document_page/i18n/hy.po
index b01070c160c..1a637bf9016 100644
--- a/document_page/i18n/hy.po
+++ b/document_page/i18n/hy.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/id.po b/document_page/i18n/id.po
index 06c8b48ce0c..0b73f7131ef 100644
--- a/document_page/i18n/id.po
+++ b/document_page/i18n/id.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Dibuat pada"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/is.po b/document_page/i18n/is.po
index 00a5525e340..8a1eb4a0c33 100644
--- a/document_page/i18n/is.po
+++ b/document_page/i18n/is.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "Auðkenni"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/it.po b/document_page/i18n/it.po
index eee1d7b832d..e80b37b0304 100644
--- a/document_page/i18n/it.po
+++ b/document_page/i18n/it.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr "Click per creare una nuova pagina web"
 msgid "Close"
 msgstr "Chiudi"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Creato il"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr "Cronologia"
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr "Nome Menu"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr "Nome"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr "Cronologia delle pagine"
 msgid "Parent Menu"
 msgstr "Menu genitore"
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -291,8 +326,8 @@ msgstr ""
 "cronologia!"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr "Riepilogo"
 
@@ -312,7 +347,7 @@ msgstr ""
 "di questa categoria."
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr "Non ci sono cambiamenti nelle revisioni"
diff --git a/document_page/i18n/ja.po b/document_page/i18n/ja.po
index 1845c337aec..28e3c0b1c19 100644
--- a/document_page/i18n/ja.po
+++ b/document_page/i18n/ja.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "作成日"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/ka.po b/document_page/i18n/ka.po
index 46edc7f5654..20d431bd8e5 100644
--- a/document_page/i18n/ka.po
+++ b/document_page/i18n/ka.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "იდენტიფიკატორი"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/kab.po b/document_page/i18n/kab.po
index 9a95ca69cc3..32c88b1ddaf 100644
--- a/document_page/i18n/kab.po
+++ b/document_page/i18n/kab.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Yerna di"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "Asulay"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/kk.po b/document_page/i18n/kk.po
index ada9229b9e9..d956860a450 100644
--- a/document_page/i18n/kk.po
+++ b/document_page/i18n/kk.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/ko.po b/document_page/i18n/ko.po
index b7e70e0fc8c..dd935415d83 100644
--- a/document_page/i18n/ko.po
+++ b/document_page/i18n/ko.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "작성일"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/ln.po b/document_page/i18n/ln.po
index 3cec8fce9f8..65ece449705 100644
--- a/document_page/i18n/ln.po
+++ b/document_page/i18n/ln.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/lo.po b/document_page/i18n/lo.po
index 46e638489a5..f2818045f4e 100644
--- a/document_page/i18n/lo.po
+++ b/document_page/i18n/lo.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/lt.po b/document_page/i18n/lt.po
index f68fc76fc9b..412f8429450 100644
--- a/document_page/i18n/lt.po
+++ b/document_page/i18n/lt.po
@@ -19,6 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
 "%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Sukurta"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/lv.po b/document_page/i18n/lv.po
index cd4e3a7e9a2..45edfd4731a 100644
--- a/document_page/i18n/lv.po
+++ b/document_page/i18n/lv.po
@@ -19,6 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
 "2);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Izveidots"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/mk.po b/document_page/i18n/mk.po
index 22ea61e636a..71d22e4107e 100644
--- a/document_page/i18n/mk.po
+++ b/document_page/i18n/mk.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Креирано на"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/mn.po b/document_page/i18n/mn.po
index b3f312d9348..465b48408c6 100644
--- a/document_page/i18n/mn.po
+++ b/document_page/i18n/mn.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Үүсгэсэн огноо"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/nb.po b/document_page/i18n/nb.po
index 293136d9e72..4fecd428c4d 100644
--- a/document_page/i18n/nb.po
+++ b/document_page/i18n/nb.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Opprettet"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/nl.po b/document_page/i18n/nl.po
index f1e0a7d73b9..3d2ba6a62a5 100644
--- a/document_page/i18n/nl.po
+++ b/document_page/i18n/nl.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Aangemaakt op"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/nl_BE.po b/document_page/i18n/nl_BE.po
index 121dcb61fa4..d7d2e6d5d63 100644
--- a/document_page/i18n/nl_BE.po
+++ b/document_page/i18n/nl_BE.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Gemaakt op"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/nl_NL.po b/document_page/i18n/nl_NL.po
index 6e1c843a9c7..511c7af1ebc 100644
--- a/document_page/i18n/nl_NL.po
+++ b/document_page/i18n/nl_NL.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr "Klik om een nieuwe webpagina aan te maken."
 msgid "Close"
 msgstr "Sluiten"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Aangemaakt op"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr "Historie"
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr "Menunaam"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr "Naam"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr "Paginahistorie"
 msgid "Parent Menu"
 msgstr "Oudermenu"
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr "Selecteer een of maximaal  twee historie-revisies!"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr "Samenvatting"
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr "Er zijn geen wijzigingen in revisies."
diff --git a/document_page/i18n/pl.po b/document_page/i18n/pl.po
index c9ea0446253..2359e9921df 100644
--- a/document_page/i18n/pl.po
+++ b/document_page/i18n/pl.po
@@ -20,6 +20,11 @@ msgstr ""
 "%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n"
 "%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -67,6 +72,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -101,7 +112,7 @@ msgid "Created on"
 msgstr "Data utworzenia"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -184,6 +195,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -240,12 +257,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -283,6 +307,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -290,8 +325,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -309,7 +344,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/pt.po b/document_page/i18n/pt.po
index a52210e8e6b..1c826c4c470 100644
--- a/document_page/i18n/pt.po
+++ b/document_page/i18n/pt.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr "Clique para criar uma nova página web."
 msgid "Close"
 msgstr "Fechar"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Criado em"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr "Histórico"
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr "Nome do Menu"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr "Nome"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr "Histórico das páginas"
 msgid "Parent Menu"
 msgstr "Menu Ascendente"
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr "Selecione uma ou, no máximo, duas revisões do histórico!"
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr "Resumo"
 
@@ -310,7 +345,7 @@ msgstr ""
 "desta categoria."
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr "Não há alterações nas revisões."
diff --git a/document_page/i18n/pt_BR.po b/document_page/i18n/pt_BR.po
index 287805d3e42..4d195da5cbd 100644
--- a/document_page/i18n/pt_BR.po
+++ b/document_page/i18n/pt_BR.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Criado em"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/pt_PT.po b/document_page/i18n/pt_PT.po
index 30f71faf31a..940f2e77250 100644
--- a/document_page/i18n/pt_PT.po
+++ b/document_page/i18n/pt_PT.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Criado em"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/ro.po b/document_page/i18n/ro.po
index ff65d8c6f55..598d27381a0 100644
--- a/document_page/i18n/ro.po
+++ b/document_page/i18n/ro.po
@@ -19,6 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
 "2:1));\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Creat la"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/ru.po b/document_page/i18n/ru.po
index 892e88e1fe0..d2efd4086d0 100644
--- a/document_page/i18n/ru.po
+++ b/document_page/i18n/ru.po
@@ -20,6 +20,11 @@ msgstr ""
 "%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
 "%100>=11 && n%100<=14)? 2 : 3);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -67,6 +72,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -101,7 +112,7 @@ msgid "Created on"
 msgstr "Создан"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -184,6 +195,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -240,12 +257,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -283,6 +307,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -290,8 +325,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -309,7 +344,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/sk.po b/document_page/i18n/sk.po
index ea222136452..030f4c371d4 100644
--- a/document_page/i18n/sk.po
+++ b/document_page/i18n/sk.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Vytvorené"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/sl.po b/document_page/i18n/sl.po
index 900e61096fe..ed6c73f8f31 100644
--- a/document_page/i18n/sl.po
+++ b/document_page/i18n/sl.po
@@ -19,6 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
 "%100==4 ? 2 : 3);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Ustvarjeno"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/sq.po b/document_page/i18n/sq.po
index 9f5579220d5..3f60e1e7ba1 100644
--- a/document_page/i18n/sq.po
+++ b/document_page/i18n/sq.po
@@ -18,6 +18,11 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-11-21 06:07+0000\n"
 "X-Generator: Poedit 1.8.2\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/sr.po b/document_page/i18n/sr.po
index 9a7b0266623..87b205cda26 100644
--- a/document_page/i18n/sr.po
+++ b/document_page/i18n/sr.po
@@ -19,6 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Kreiran"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/sr@latin.po b/document_page/i18n/sr@latin.po
index b91b4df1f1d..446e0cab723 100644
--- a/document_page/i18n/sr@latin.po
+++ b/document_page/i18n/sr@latin.po
@@ -20,6 +20,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -67,6 +72,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -101,7 +112,7 @@ msgid "Created on"
 msgstr "Kreiran"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -184,6 +195,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -240,12 +257,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -283,6 +307,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -290,8 +325,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -309,7 +344,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/sv.po b/document_page/i18n/sv.po
index 31b4a1c497e..faedda84b1e 100644
--- a/document_page/i18n/sv.po
+++ b/document_page/i18n/sv.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Skapad den"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/th.po b/document_page/i18n/th.po
index ec198240e1d..320c89dbd39 100644
--- a/document_page/i18n/th.po
+++ b/document_page/i18n/th.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "สร้างเมื่อ"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "รหัส"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/tlh.po b/document_page/i18n/tlh.po
index 750fbfad7ae..3964527128a 100644
--- a/document_page/i18n/tlh.po
+++ b/document_page/i18n/tlh.po
@@ -18,6 +18,11 @@ msgstr ""
 "X-Launchpad-Export-Date: 2013-11-21 06:08+0000\n"
 "X-Generator: Poedit 1.8.2\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr ""
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/tr.po b/document_page/i18n/tr.po
index a24ae9a0ddd..74ed7c40110 100644
--- a/document_page/i18n/tr.po
+++ b/document_page/i18n/tr.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Oluşturma"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/uk.po b/document_page/i18n/uk.po
index d097ab4612b..199b3113d38 100644
--- a/document_page/i18n/uk.po
+++ b/document_page/i18n/uk.po
@@ -19,6 +19,11 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "Створено"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/vi.po b/document_page/i18n/vi.po
index 06d34282623..d319cefc9ae 100644
--- a/document_page/i18n/vi.po
+++ b/document_page/i18n/vi.po
@@ -18,6 +18,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -65,6 +70,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -99,7 +110,7 @@ msgid "Created on"
 msgstr "Tạo trên"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -182,6 +193,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -238,12 +255,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -281,6 +305,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -288,8 +323,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -307,7 +342,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/zh_CN.po b/document_page/i18n/zh_CN.po
index 6aa7c0f33e1..2fdd27c4d5e 100644
--- a/document_page/i18n/zh_CN.po
+++ b/document_page/i18n/zh_CN.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "创建"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page/i18n/zh_TW.po b/document_page/i18n/zh_TW.po
index c8d3a5e832e..6ab2e9bdec0 100644
--- a/document_page/i18n/zh_TW.po
+++ b/document_page/i18n/zh_TW.po
@@ -19,6 +19,11 @@ msgstr ""
 "Content-Transfer-Encoding: \n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_active
+msgid "Active"
+msgstr ""
+
 #. module: document_page
 #: model:ir.ui.view,arch_db:document_page.view_wiki_filter
 #: model:ir.ui.view,arch_db:document_page.view_wiki_history_filter
@@ -66,6 +71,12 @@ msgstr ""
 msgid "Close"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_company_id
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_company_id
+msgid "Company"
+msgstr ""
+
 #. module: document_page
 #: selection:document.page,type:0
 #: model:ir.model.fields,field_description:document_page.field_document_page_content
@@ -100,7 +111,7 @@ msgid "Created on"
 msgstr "建立於"
 
 #. module: document_page
-#: model:ir.model.fields,help:document_page.field_document_page_summary
+#: model:ir.model.fields,help:document_page.field_document_page_draft_summary
 msgid "Describe the changes made"
 msgstr ""
 
@@ -183,6 +194,12 @@ msgstr ""
 msgid "ID"
 msgstr "ID"
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_company_id
+#: model:ir.model.fields,help:document_page.field_document_page_history_company_id
+msgid "If set, page is accessible only from this company"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_content_date
 msgid "Last Contribution Date"
@@ -239,12 +256,19 @@ msgid "Menu Name"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_name
+#: model:ir.model.fields,field_description:document_page.field_document_page_history_name
 #: model:ir.ui.view,arch_db:document_page.view_category_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_form
 #: model:ir.ui.view,arch_db:document_page.view_wiki_menu_form
 msgid "Name"
 msgstr ""
 
+#. module: document_page
+#: model:ir.model.fields,help:document_page.field_document_page_draft_name
+msgid "Name for the changes made"
+msgstr ""
+
 #. module: document_page
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_page_id
 msgid "Page"
@@ -282,6 +306,17 @@ msgstr ""
 msgid "Parent Menu"
 msgstr ""
 
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+#: model:ir.ui.view,arch_db:document_page.wiki_history_form
+msgid "Rev 01"
+msgstr ""
+
+#. module: document_page
+#: model:ir.ui.view,arch_db:document_page.view_wiki_form
+msgid "Revision"
+msgstr ""
+
 #. module: document_page
 #: code:addons/document_page/wizard/document_page_show_diff.py:28
 #, python-format
@@ -289,8 +324,8 @@ msgid "Select one or maximum two history revisions!"
 msgstr ""
 
 #. module: document_page
+#: model:ir.model.fields,field_description:document_page.field_document_page_draft_summary
 #: model:ir.model.fields,field_description:document_page.field_document_page_history_summary
-#: model:ir.model.fields,field_description:document_page.field_document_page_summary
 msgid "Summary"
 msgstr ""
 
@@ -308,7 +343,7 @@ msgid ""
 msgstr ""
 
 #. module: document_page
-#: code:addons/document_page/models/document_page_history.py:49
+#: code:addons/document_page/models/document_page_history.py:59
 #, python-format
 msgid "There are no changes in revisions."
 msgstr ""
diff --git a/document_page_approval/i18n/am.po b/document_page_approval/i18n/am.po
index 09f59f16435..441beea9e1e 100644
--- a/document_page_approval/i18n/am.po
+++ b/document_page_approval/i18n/am.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/ar.po b/document_page_approval/i18n/ar.po
index 491272b3206..e52ffb39dbd 100644
--- a/document_page_approval/i18n/ar.po
+++ b/document_page_approval/i18n/ar.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/bg.po b/document_page_approval/i18n/bg.po
index e44b8c5128d..6959042c989 100644
--- a/document_page_approval/i18n/bg.po
+++ b/document_page_approval/i18n/bg.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/bs.po b/document_page_approval/i18n/bs.po
index 31040acc2b7..cde754e96a5 100644
--- a/document_page_approval/i18n/bs.po
+++ b/document_page_approval/i18n/bs.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/ca.po b/document_page_approval/i18n/ca.po
index 1903de21c12..b4d790ed8d7 100644
--- a/document_page_approval/i18n/ca.po
+++ b/document_page_approval/i18n/ca.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/cs.po b/document_page_approval/i18n/cs.po
index a05971d1d0c..c09bf33b86b 100644
--- a/document_page_approval/i18n/cs.po
+++ b/document_page_approval/i18n/cs.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/da.po b/document_page_approval/i18n/da.po
index 211f58edd1d..8617f5349ef 100644
--- a/document_page_approval/i18n/da.po
+++ b/document_page_approval/i18n/da.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/de.po b/document_page_approval/i18n/de.po
index e5119b76e38..00ae8eb1412 100644
--- a/document_page_approval/i18n/de.po
+++ b/document_page_approval/i18n/de.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr "Neue Fassung des Dokuments %s freigegeben."
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr "URL"
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/el.po b/document_page_approval/i18n/el.po
index 59f2b8252ce..48b4e8c67ff 100644
--- a/document_page_approval/i18n/el.po
+++ b/document_page_approval/i18n/el.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/en_AU.po b/document_page_approval/i18n/en_AU.po
index 6cc5a1704a5..764be696dfe 100644
--- a/document_page_approval/i18n/en_AU.po
+++ b/document_page_approval/i18n/en_AU.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/en_GB.po b/document_page_approval/i18n/en_GB.po
index 735b5f68fa1..d2fca77b246 100644
--- a/document_page_approval/i18n/en_GB.po
+++ b/document_page_approval/i18n/en_GB.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/es.po b/document_page_approval/i18n/es.po
index cb7d0d51106..1f674959ba8 100644
--- a/document_page_approval/i18n/es.po
+++ b/document_page_approval/i18n/es.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr "Nueva versión del documento %s aprobada."
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr "URL"
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/es_AR.po b/document_page_approval/i18n/es_AR.po
index 3b8289c4e6a..69d6c971bd1 100644
--- a/document_page_approval/i18n/es_AR.po
+++ b/document_page_approval/i18n/es_AR.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/es_CL.po b/document_page_approval/i18n/es_CL.po
index 730fbfb11f1..af7bfcb5e8b 100644
--- a/document_page_approval/i18n/es_CL.po
+++ b/document_page_approval/i18n/es_CL.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/es_CO.po b/document_page_approval/i18n/es_CO.po
index b94a0ec75e5..71c220c8d51 100644
--- a/document_page_approval/i18n/es_CO.po
+++ b/document_page_approval/i18n/es_CO.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/es_CR.po b/document_page_approval/i18n/es_CR.po
index c1a4d3e7621..78f182f709b 100644
--- a/document_page_approval/i18n/es_CR.po
+++ b/document_page_approval/i18n/es_CR.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -116,6 +124,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -135,13 +155,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -178,25 +198,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr "Nueva versión del documento %s aprobada."
@@ -251,13 +259,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/es_DO.po b/document_page_approval/i18n/es_DO.po
index 3ca49171c61..771612c9770 100644
--- a/document_page_approval/i18n/es_DO.po
+++ b/document_page_approval/i18n/es_DO.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/es_EC.po b/document_page_approval/i18n/es_EC.po
index ec6f04da0c6..324ad04f447 100644
--- a/document_page_approval/i18n/es_EC.po
+++ b/document_page_approval/i18n/es_EC.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/es_ES.po b/document_page_approval/i18n/es_ES.po
index 7c1661723cc..e83ea55d8ca 100644
--- a/document_page_approval/i18n/es_ES.po
+++ b/document_page_approval/i18n/es_ES.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/es_MX.po b/document_page_approval/i18n/es_MX.po
index a30f1b9c789..400016f2e48 100644
--- a/document_page_approval/i18n/es_MX.po
+++ b/document_page_approval/i18n/es_MX.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/es_PY.po b/document_page_approval/i18n/es_PY.po
index afe0b6ca3e4..9e1c583bae2 100644
--- a/document_page_approval/i18n/es_PY.po
+++ b/document_page_approval/i18n/es_PY.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/es_VE.po b/document_page_approval/i18n/es_VE.po
index 6afacfb3473..52a338e3c61 100644
--- a/document_page_approval/i18n/es_VE.po
+++ b/document_page_approval/i18n/es_VE.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/et.po b/document_page_approval/i18n/et.po
index 369853069d7..d0a8d17fec0 100644
--- a/document_page_approval/i18n/et.po
+++ b/document_page_approval/i18n/et.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/eu.po b/document_page_approval/i18n/eu.po
index 57cbdf39d5f..c471ba5e25f 100644
--- a/document_page_approval/i18n/eu.po
+++ b/document_page_approval/i18n/eu.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/fa.po b/document_page_approval/i18n/fa.po
index 7e53c192e71..4aa4ac03d19 100644
--- a/document_page_approval/i18n/fa.po
+++ b/document_page_approval/i18n/fa.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/fi.po b/document_page_approval/i18n/fi.po
index ce1a170a2cf..aba49811b46 100644
--- a/document_page_approval/i18n/fi.po
+++ b/document_page_approval/i18n/fi.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/fr.po b/document_page_approval/i18n/fr.po
index 83ee4a8ea06..b55e66daa7f 100644
--- a/document_page_approval/i18n/fr.po
+++ b/document_page_approval/i18n/fr.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr "URL"
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/fr_CA.po b/document_page_approval/i18n/fr_CA.po
index 91ad17ceb50..a99e87a3eb0 100644
--- a/document_page_approval/i18n/fr_CA.po
+++ b/document_page_approval/i18n/fr_CA.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/gl.po b/document_page_approval/i18n/gl.po
index 604d04e69cb..da3243c3cad 100644
--- a/document_page_approval/i18n/gl.po
+++ b/document_page_approval/i18n/gl.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/gu.po b/document_page_approval/i18n/gu.po
index 36effb62e3e..62d02f25a57 100644
--- a/document_page_approval/i18n/gu.po
+++ b/document_page_approval/i18n/gu.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/he.po b/document_page_approval/i18n/he.po
index f29df0589c9..fe3d4a2af99 100644
--- a/document_page_approval/i18n/he.po
+++ b/document_page_approval/i18n/he.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/hi.po b/document_page_approval/i18n/hi.po
index 4ac6403cf6a..9245e41ed70 100644
--- a/document_page_approval/i18n/hi.po
+++ b/document_page_approval/i18n/hi.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/hr.po b/document_page_approval/i18n/hr.po
index 5d95ade0987..8796677cf13 100644
--- a/document_page_approval/i18n/hr.po
+++ b/document_page_approval/i18n/hr.po
@@ -55,6 +55,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -117,6 +125,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -136,13 +156,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -179,25 +199,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr "Nova verzija dokumenta %s odobrena"
@@ -252,13 +260,42 @@ msgstr ""
 msgid "URL"
 msgstr "URL"
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/hu.po b/document_page_approval/i18n/hu.po
index 4a4dd66b8cb..524fb521cf0 100644
--- a/document_page_approval/i18n/hu.po
+++ b/document_page_approval/i18n/hu.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/hy.po b/document_page_approval/i18n/hy.po
index 91deb8a3090..9714e06b230 100644
--- a/document_page_approval/i18n/hy.po
+++ b/document_page_approval/i18n/hy.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/id.po b/document_page_approval/i18n/id.po
index a5500b8a1fb..2fb145a8d13 100644
--- a/document_page_approval/i18n/id.po
+++ b/document_page_approval/i18n/id.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/it.po b/document_page_approval/i18n/it.po
index b868997ee36..183e0ee52ef 100644
--- a/document_page_approval/i18n/it.po
+++ b/document_page_approval/i18n/it.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -116,6 +124,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -135,13 +155,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -178,25 +198,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr "La nuova versione del documento %s è approvata."
@@ -251,13 +259,42 @@ msgstr ""
 msgid "URL"
 msgstr "URL"
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/ja.po b/document_page_approval/i18n/ja.po
index 0ceef4e0a9e..511023b23fb 100644
--- a/document_page_approval/i18n/ja.po
+++ b/document_page_approval/i18n/ja.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/ka.po b/document_page_approval/i18n/ka.po
index 9a7281fe5a8..91b66d955d4 100644
--- a/document_page_approval/i18n/ka.po
+++ b/document_page_approval/i18n/ka.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/kab.po b/document_page_approval/i18n/kab.po
index 26f194071c7..0041682a520 100644
--- a/document_page_approval/i18n/kab.po
+++ b/document_page_approval/i18n/kab.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/kk.po b/document_page_approval/i18n/kk.po
index 6c14734dd23..b7e49e812ac 100644
--- a/document_page_approval/i18n/kk.po
+++ b/document_page_approval/i18n/kk.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/ko.po b/document_page_approval/i18n/ko.po
index 31e1066c96a..17ea30158f0 100644
--- a/document_page_approval/i18n/ko.po
+++ b/document_page_approval/i18n/ko.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/ln.po b/document_page_approval/i18n/ln.po
index 412d8148f67..a1c5789181c 100644
--- a/document_page_approval/i18n/ln.po
+++ b/document_page_approval/i18n/ln.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/lo.po b/document_page_approval/i18n/lo.po
index ecd890c3393..f158a713b90 100644
--- a/document_page_approval/i18n/lo.po
+++ b/document_page_approval/i18n/lo.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/lt.po b/document_page_approval/i18n/lt.po
index 90135cd07f2..5efd36ab274 100644
--- a/document_page_approval/i18n/lt.po
+++ b/document_page_approval/i18n/lt.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/lv.po b/document_page_approval/i18n/lv.po
index 5802b29b15c..4654497a067 100644
--- a/document_page_approval/i18n/lv.po
+++ b/document_page_approval/i18n/lv.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/mk.po b/document_page_approval/i18n/mk.po
index ae0fb6a2e33..ff7e6b730ac 100644
--- a/document_page_approval/i18n/mk.po
+++ b/document_page_approval/i18n/mk.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/mn.po b/document_page_approval/i18n/mn.po
index d55721f5bc2..ed624dbafee 100644
--- a/document_page_approval/i18n/mn.po
+++ b/document_page_approval/i18n/mn.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/nb.po b/document_page_approval/i18n/nb.po
index 59be6738308..90a785d947b 100644
--- a/document_page_approval/i18n/nb.po
+++ b/document_page_approval/i18n/nb.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/nl.po b/document_page_approval/i18n/nl.po
index 2a47925fc0f..f192a6fc4b0 100644
--- a/document_page_approval/i18n/nl.po
+++ b/document_page_approval/i18n/nl.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -116,6 +124,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -135,13 +155,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -178,25 +198,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -251,13 +259,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/nl_BE.po b/document_page_approval/i18n/nl_BE.po
index 51441e989ed..16e6e75cd55 100644
--- a/document_page_approval/i18n/nl_BE.po
+++ b/document_page_approval/i18n/nl_BE.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/nl_NL.po b/document_page_approval/i18n/nl_NL.po
index 610363354e1..87fdf089947 100644
--- a/document_page_approval/i18n/nl_NL.po
+++ b/document_page_approval/i18n/nl_NL.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -116,6 +124,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -135,13 +155,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -178,25 +198,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -251,13 +259,42 @@ msgstr ""
 msgid "URL"
 msgstr "URL"
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/pl.po b/document_page_approval/i18n/pl.po
index c209ee105da..d3c443c6086 100644
--- a/document_page_approval/i18n/pl.po
+++ b/document_page_approval/i18n/pl.po
@@ -55,6 +55,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -116,6 +124,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -135,13 +155,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -178,25 +198,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -251,13 +259,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/pt.po b/document_page_approval/i18n/pt.po
index 97f32949ead..41592fd5bfb 100644
--- a/document_page_approval/i18n/pt.po
+++ b/document_page_approval/i18n/pt.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -116,6 +124,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -135,13 +155,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -178,25 +198,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr "Uma nova versão do ocumento %s foi aprovada."
@@ -251,13 +259,42 @@ msgstr ""
 msgid "URL"
 msgstr "URL"
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/pt_BR.po b/document_page_approval/i18n/pt_BR.po
index a1f935aaa6e..b3fc887b0bb 100644
--- a/document_page_approval/i18n/pt_BR.po
+++ b/document_page_approval/i18n/pt_BR.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/pt_PT.po b/document_page_approval/i18n/pt_PT.po
index e22cd1b47d6..976b46ccaf2 100644
--- a/document_page_approval/i18n/pt_PT.po
+++ b/document_page_approval/i18n/pt_PT.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -116,6 +124,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -135,13 +155,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -178,25 +198,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr "Foi aprovada a nova versão do documento %s."
@@ -251,13 +259,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/ro.po b/document_page_approval/i18n/ro.po
index 78265308dc5..04134c8ce36 100644
--- a/document_page_approval/i18n/ro.po
+++ b/document_page_approval/i18n/ro.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/ru.po b/document_page_approval/i18n/ru.po
index 9fa60a61d13..dc261d79c63 100644
--- a/document_page_approval/i18n/ru.po
+++ b/document_page_approval/i18n/ru.po
@@ -55,6 +55,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -116,6 +124,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -135,13 +155,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -178,25 +198,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -251,13 +259,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/sk.po b/document_page_approval/i18n/sk.po
index 9a6ef6dacd5..7089ba4e587 100644
--- a/document_page_approval/i18n/sk.po
+++ b/document_page_approval/i18n/sk.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/sl.po b/document_page_approval/i18n/sl.po
index 243ef0d7a46..abb2b1e32aa 100644
--- a/document_page_approval/i18n/sl.po
+++ b/document_page_approval/i18n/sl.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -116,6 +124,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -135,13 +155,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -178,25 +198,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr "Nova verzija dokumenta %s odobrena."
@@ -251,13 +259,42 @@ msgstr ""
 msgid "URL"
 msgstr "URL"
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/sr.po b/document_page_approval/i18n/sr.po
index d5d1906b472..8b8c64033a3 100644
--- a/document_page_approval/i18n/sr.po
+++ b/document_page_approval/i18n/sr.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/sr@latin.po b/document_page_approval/i18n/sr@latin.po
index f13617bc0e3..181d038a8a2 100644
--- a/document_page_approval/i18n/sr@latin.po
+++ b/document_page_approval/i18n/sr@latin.po
@@ -55,6 +55,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -116,6 +124,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -135,13 +155,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -178,25 +198,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -251,13 +259,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/sv.po b/document_page_approval/i18n/sv.po
index df82085c1b8..6ef11bbae7f 100644
--- a/document_page_approval/i18n/sv.po
+++ b/document_page_approval/i18n/sv.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/th.po b/document_page_approval/i18n/th.po
index bd9851d0f9c..015aa58ade7 100644
--- a/document_page_approval/i18n/th.po
+++ b/document_page_approval/i18n/th.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/tr.po b/document_page_approval/i18n/tr.po
index 5590e4f6b38..e9a897e6b45 100644
--- a/document_page_approval/i18n/tr.po
+++ b/document_page_approval/i18n/tr.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/uk.po b/document_page_approval/i18n/uk.po
index 824e82fe734..a900c506942 100644
--- a/document_page_approval/i18n/uk.po
+++ b/document_page_approval/i18n/uk.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/vi.po b/document_page_approval/i18n/vi.po
index 42d7f391db4..257c3afccba 100644
--- a/document_page_approval/i18n/vi.po
+++ b/document_page_approval/i18n/vi.po
@@ -53,6 +53,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -114,6 +122,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -133,13 +153,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -176,25 +196,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -249,13 +257,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/zh_CN.po b/document_page_approval/i18n/zh_CN.po
index ce89235b3c5..c9abfa3defd 100644
--- a/document_page_approval/i18n/zh_CN.po
+++ b/document_page_approval/i18n/zh_CN.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_page_approval/i18n/zh_TW.po b/document_page_approval/i18n/zh_TW.po
index 303ab148e15..279f0d24987 100644
--- a/document_page_approval/i18n/zh_TW.po
+++ b/document_page_approval/i18n/zh_TW.po
@@ -54,6 +54,14 @@ msgid ""
 "        "
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.ui.view,arch_db:document_page_approval.wiki_form_inherit
+msgid ""
+"<b>You already have a Draft Change Request for this page.</b>\n"
+"                    It is highly recommended that you edit that one instead "
+"of creating a new one."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_am_i_approver
 #: model:ir.model.fields,field_description:document_page_approval.field_document_page_history_am_i_approver
@@ -115,6 +123,18 @@ msgstr ""
 msgid "Back to draft"
 msgstr ""
 
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:100
+#, python-format
+msgid "Can't approve page in '%s' state."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:76
+#, python-format
+msgid "Can't approve pages in '%s' state."
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.ui.view,arch_db:document_page_approval.wiki_history_form_inherit
 msgid "Cancel"
@@ -134,13 +154,13 @@ msgid "Change Requests"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:129
+#: code:addons/document_page_approval/models/document_page_history.py:138
 #, python-format
 msgid "Change request <b>%s</b> has been cancelled by %s."
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:110
+#: code:addons/document_page_approval/models/document_page_history.py:119
 #, python-format
 msgid "Change request has been approved by %s."
 msgstr ""
@@ -177,25 +197,13 @@ msgstr ""
 msgid "If true, changes of this page require approval"
 msgstr ""
 
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:59
-#, python-format
-msgid "It's not cancelled or approved"
-msgstr ""
-
-#. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:71
-#, python-format
-msgid "It's not in draft state"
-msgstr ""
-
 #. module: document_page_approval
 #: model:mail.template,subject:document_page_approval.email_template_new_draft_need_approval
 msgid "New version of ${object.display_name} needs your approval"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:117
+#: code:addons/document_page_approval/models/document_page_history.py:126
 #, python-format
 msgid "New version of the document %s approved."
 msgstr ""
@@ -250,13 +258,42 @@ msgstr ""
 msgid "URL"
 msgstr ""
 
+#. module: document_page_approval
+#: model:ir.model.fields,field_description:document_page_approval.field_document_page_user_has_drafts
+msgid "User has drafts?"
+msgstr ""
+
 #. module: document_page_approval
 #: model:ir.model.fields,help:document_page_approval.field_document_page_approver_gid
 msgid "Users must also belong to the Approvers group"
 msgstr ""
 
 #. module: document_page_approval
-#: code:addons/document_page_approval/models/document_page_history_workflow.py:62
+#: code:addons/document_page_approval/models/document_page_history.py:102
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only approvers with these groups can approve this: "
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:62
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can reopen Change Requests."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:79
+#, python-format
+msgid ""
+"You are not authorized to do this.\r\n"
+"Only owners or approvers can request approval."
+msgstr ""
+
+#. module: document_page_approval
+#: code:addons/document_page_approval/models/document_page_history.py:59
 #, python-format
-msgid "You are not an appover to reset to draft"
+msgid "You need to cancel it before reopening."
 msgstr ""
diff --git a/document_url/i18n/am.po b/document_url/i18n/am.po
index 82e95c56560..b340c9b2b2c 100644
--- a/document_url/i18n/am.po
+++ b/document_url/i18n/am.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-13 13:00+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Amharic (https://www.transifex.com/oca/teams/23907/am/)\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: am\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/ar.po b/document_url/i18n/ar.po
index 76d943b58ca..75b15830b51 100644
--- a/document_url/i18n/ar.po
+++ b/document_url/i18n/ar.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. module: document_url
 #: model:ir.ui.view,arch_db:document_url.view_ir_attachment_add_url_form
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/bg.po b/document_url/i18n/bg.po
index 21eb1d60c86..d93be60fe5d 100644
--- a/document_url/i18n/bg.po
+++ b/document_url/i18n/bg.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Bulgarian (https://www.transifex.com/oca/teams/23907/bg/)\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/bs.po b/document_url/i18n/bs.po
index 064de71c7f4..20c809296a2 100644
--- a/document_url/i18n/bs.po
+++ b/document_url/i18n/bs.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Bosnian (https://www.transifex.com/oca/teams/23907/bs/)\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: bs\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: document_url
 #: model:ir.ui.view,arch_db:document_url.view_ir_attachment_add_url_form
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/ca.po b/document_url/i18n/ca.po
index 4dbd6614f72..41d98e5a515 100644
--- a/document_url/i18n/ca.po
+++ b/document_url/i18n/ca.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-13 13:00+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/cs.po b/document_url/i18n/cs.po
index 653dc079b7c..5bc5a1998c0 100644
--- a/document_url/i18n/cs.po
+++ b/document_url/i18n/cs.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Czech (https://www.transifex.com/oca/teams/23907/cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/da.po b/document_url/i18n/da.po
index 64e231627b5..bcde1c192da 100644
--- a/document_url/i18n/da.po
+++ b/document_url/i18n/da.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/de.po b/document_url/i18n/de.po
index 2616ff21945..1ebbc4e6afc 100644
--- a/document_url/i18n/de.po
+++ b/document_url/i18n/de.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # Rudolf Schnapka <rs@techno-flex.de>, 2016
 # OCA Transbot <transbot@odoo-community.org>, 2016
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -32,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/el.po b/document_url/i18n/el.po
index e762be1d153..988f35ed0ab 100644
--- a/document_url/i18n/el.po
+++ b/document_url/i18n/el.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Greek (https://www.transifex.com/oca/teams/23907/el/)\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/el_GR.po b/document_url/i18n/el_GR.po
index 3e2afdc9aff..0dfc64910ca 100644
--- a/document_url/i18n/el_GR.po
+++ b/document_url/i18n/el_GR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-13 13:00+0000\n"
 "PO-Revision-Date: 2016-08-13 13:00+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/el_GR/)\n"
+"Language-Team: Greek (Greece) (https://www.transifex.com/oca/teams/23907/"
+"el_GR/)\n"
+"Language: el_GR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/en_AU.po b/document_url/i18n/en_AU.po
index e5ae2e72f7b..76ae4d3549d 100644
--- a/document_url/i18n/en_AU.po
+++ b/document_url/i18n/en_AU.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: English (Australia) (https://www.transifex.com/oca/teams/23907/en_AU/)\n"
+"Language-Team: English (Australia) (https://www.transifex.com/oca/"
+"teams/23907/en_AU/)\n"
+"Language: en_AU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: en_AU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/en_GB.po b/document_url/i18n/en_GB.po
index bf5b3f44dc8..8d35facf598 100644
--- a/document_url/i18n/en_GB.po
+++ b/document_url/i18n/en_GB.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/teams/23907/en_GB/)\n"
+"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/"
+"teams/23907/en_GB/)\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/es.po b/document_url/i18n/es.po
index 4ccffc97a1e..8db05b603b3 100644
--- a/document_url/i18n/es.po
+++ b/document_url/i18n/es.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-13 13:00+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr "Añadir URL"
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr "Añadir URL..."
diff --git a/document_url/i18n/es_AR.po b/document_url/i18n/es_AR.po
index 9bc02b3154a..ff1ad75c3f5 100644
--- a/document_url/i18n/es_AR.po
+++ b/document_url/i18n/es_AR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/teams/23907/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/"
+"teams/23907/es_AR/)\n"
+"Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/es_CL.po b/document_url/i18n/es_CL.po
index 6ec253dda48..5c00e4d33c2 100644
--- a/document_url/i18n/es_CL.po
+++ b/document_url/i18n/es_CL.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Chile) (https://www.transifex.com/oca/teams/23907/es_CL/)\n"
+"Language-Team: Spanish (Chile) (https://www.transifex.com/oca/teams/23907/"
+"es_CL/)\n"
+"Language: es_CL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/es_CO.po b/document_url/i18n/es_CO.po
index 1400d0f8fbd..e425378f075 100644
--- a/document_url/i18n/es_CO.po
+++ b/document_url/i18n/es_CO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/es_CO/)\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/"
+"es_CO/)\n"
+"Language: es_CO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/es_CR.po b/document_url/i18n/es_CR.po
index 717ee8176fc..5240c01824b 100644
--- a/document_url/i18n/es_CR.po
+++ b/document_url/i18n/es_CR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/teams/23907/es_CR/)\n"
+"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/"
+"teams/23907/es_CR/)\n"
+"Language: es_CR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/es_DO.po b/document_url/i18n/es_DO.po
index 318ae584aaf..82c2ab3ff00 100644
--- a/document_url/i18n/es_DO.po
+++ b/document_url/i18n/es_DO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/teams/23907/es_DO/)\n"
+"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/"
+"teams/23907/es_DO/)\n"
+"Language: es_DO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_DO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/es_EC.po b/document_url/i18n/es_EC.po
index 12c7e9462de..f7f4feae52d 100644
--- a/document_url/i18n/es_EC.po
+++ b/document_url/i18n/es_EC.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/es_EC/)\n"
+"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/"
+"es_EC/)\n"
+"Language: es_EC\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_EC\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/es_ES.po b/document_url/i18n/es_ES.po
index 0ebe7fc8891..1246d665866 100644
--- a/document_url/i18n/es_ES.po
+++ b/document_url/i18n/es_ES.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-13 13:00+0000\n"
 "PO-Revision-Date: 2016-08-13 13:00+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Spain) (https://www.transifex.com/oca/teams/23907/es_ES/)\n"
+"Language-Team: Spanish (Spain) (https://www.transifex.com/oca/teams/23907/"
+"es_ES/)\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/es_MX.po b/document_url/i18n/es_MX.po
index f3c931bbe2f..7894df62231 100644
--- a/document_url/i18n/es_MX.po
+++ b/document_url/i18n/es_MX.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n"
+"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/"
+"es_MX/)\n"
+"Language: es_MX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/es_PY.po b/document_url/i18n/es_PY.po
index b81ce04064f..86e6e2c22fd 100644
--- a/document_url/i18n/es_PY.po
+++ b/document_url/i18n/es_PY.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/es_PY/)\n"
+"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/"
+"es_PY/)\n"
+"Language: es_PY\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_PY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/es_VE.po b/document_url/i18n/es_VE.po
index a5050936951..3278063559b 100644
--- a/document_url/i18n/es_VE.po
+++ b/document_url/i18n/es_VE.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/teams/23907/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/"
+"teams/23907/es_VE/)\n"
+"Language: es_VE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/et.po b/document_url/i18n/et.po
index 27e8beb26c2..1d381df3b1e 100644
--- a/document_url/i18n/et.po
+++ b/document_url/i18n/et.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Estonian (https://www.transifex.com/oca/teams/23907/et/)\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/eu.po b/document_url/i18n/eu.po
index 4284fadc902..2a75aaf7049 100644
--- a/document_url/i18n/eu.po
+++ b/document_url/i18n/eu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Basque (https://www.transifex.com/oca/teams/23907/eu/)\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/fa.po b/document_url/i18n/fa.po
index 4ff1b5f23d3..8ddf7f26e0d 100644
--- a/document_url/i18n/fa.po
+++ b/document_url/i18n/fa.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Persian (https://www.transifex.com/oca/teams/23907/fa/)\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/fi.po b/document_url/i18n/fi.po
index 7ff7920677c..0df3e6c4e14 100644
--- a/document_url/i18n/fi.po
+++ b/document_url/i18n/fi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 # Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>, 2016
@@ -13,10 +13,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-13 13:00+0000\n"
 "Last-Translator: Jarmo Kortetjärvi <jarmo.kortetjarvi@gmail.com>, 2016\n"
 "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -32,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/fr.po b/document_url/i18n/fr.po
index 4a3f08884c1..d825ed1ab6a 100644
--- a/document_url/i18n/fr.po
+++ b/document_url/i18n/fr.po
@@ -1,6 +1,6 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
-#	* document_url
+# 	* document_url
 #
 msgid ""
 msgstr ""
@@ -10,6 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2016-03-15 09:24+0000\n"
 "Last-Translator: <>\n"
 "Language-Team: \n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
@@ -28,7 +29,7 @@ msgstr "Ajouter URL"
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr "Ajouter URL..."
@@ -92,4 +93,3 @@ msgstr "ir.attachment.add_url"
 #: model:ir.ui.view,arch_db:document_url.view_ir_attachment_add_url_form
 msgid "or"
 msgstr "ou"
-
diff --git a/document_url/i18n/fr_CA.po b/document_url/i18n/fr_CA.po
index c3f57c3ca31..7ff75f154d3 100644
--- a/document_url/i18n/fr_CA.po
+++ b/document_url/i18n/fr_CA.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: French (Canada) (https://www.transifex.com/oca/teams/23907/fr_CA/)\n"
+"Language-Team: French (Canada) (https://www.transifex.com/oca/teams/23907/"
+"fr_CA/)\n"
+"Language: fr_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/gl.po b/document_url/i18n/gl.po
index 8197312ee35..5d711576952 100644
--- a/document_url/i18n/gl.po
+++ b/document_url/i18n/gl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-13 13:00+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/gu.po b/document_url/i18n/gu.po
index 40c134081e7..6020174035c 100644
--- a/document_url/i18n/gu.po
+++ b/document_url/i18n/gu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Gujarati (https://www.transifex.com/oca/teams/23907/gu/)\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/he.po b/document_url/i18n/he.po
index 826093e653e..c34898f5b2c 100644
--- a/document_url/i18n/he.po
+++ b/document_url/i18n/he.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Hebrew (https://www.transifex.com/oca/teams/23907/he/)\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/hi.po b/document_url/i18n/hi.po
index fb3137eeb36..acd6520e687 100644
--- a/document_url/i18n/hi.po
+++ b/document_url/i18n/hi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Hindi (https://www.transifex.com/oca/teams/23907/hi/)\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/hr.po b/document_url/i18n/hr.po
index 4534cf76d66..a24afe1e39d 100644
--- a/document_url/i18n/hr.po
+++ b/document_url/i18n/hr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: document_url
 #: model:ir.ui.view,arch_db:document_url.view_ir_attachment_add_url_form
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/hu.po b/document_url/i18n/hu.po
index ca89680a472..23d780fad7f 100644
--- a/document_url/i18n/hu.po
+++ b/document_url/i18n/hu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/hy.po b/document_url/i18n/hy.po
index 64662e0e915..da9ab061d3d 100644
--- a/document_url/i18n/hy.po
+++ b/document_url/i18n/hy.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Armenian (https://www.transifex.com/oca/teams/23907/hy/)\n"
+"Language: hy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/id.po b/document_url/i18n/id.po
index 99445c39837..9314177439b 100644
--- a/document_url/i18n/id.po
+++ b/document_url/i18n/id.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Indonesian (https://www.transifex.com/oca/teams/23907/id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/is.po b/document_url/i18n/is.po
index 982daed9289..052db5b7b76 100644
--- a/document_url/i18n/is.po
+++ b/document_url/i18n/is.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Icelandic (https://www.transifex.com/oca/teams/23907/is/)\n"
+"Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/it.po b/document_url/i18n/it.po
index 2c133820955..c48b4dddc7c 100644
--- a/document_url/i18n/it.po
+++ b/document_url/i18n/it.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-13 13:00+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/ja.po b/document_url/i18n/ja.po
index 7399b1b8bf6..188e0688167 100644
--- a/document_url/i18n/ja.po
+++ b/document_url/i18n/ja.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Japanese (https://www.transifex.com/oca/teams/23907/ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/ka.po b/document_url/i18n/ka.po
index cf43ea7f731..1b6f2bd3dca 100644
--- a/document_url/i18n/ka.po
+++ b/document_url/i18n/ka.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Georgian (https://www.transifex.com/oca/teams/23907/ka/)\n"
+"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/kab.po b/document_url/i18n/kab.po
index 9c1570df887..2cf765d765a 100644
--- a/document_url/i18n/kab.po
+++ b/document_url/i18n/kab.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Kabyle (https://www.transifex.com/oca/teams/23907/kab/)\n"
+"Language: kab\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: kab\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/kk.po b/document_url/i18n/kk.po
index 113966f8774..eb0c7c3a7c4 100644
--- a/document_url/i18n/kk.po
+++ b/document_url/i18n/kk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Kazakh (https://www.transifex.com/oca/teams/23907/kk/)\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/ko.po b/document_url/i18n/ko.po
index 1e8333fd009..d01ec19dad3 100644
--- a/document_url/i18n/ko.po
+++ b/document_url/i18n/ko.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Korean (https://www.transifex.com/oca/teams/23907/ko/)\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/ln.po b/document_url/i18n/ln.po
index 10d96a07b22..b41df00acbd 100644
--- a/document_url/i18n/ln.po
+++ b/document_url/i18n/ln.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Lingala (https://www.transifex.com/oca/teams/23907/ln/)\n"
+"Language: ln\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ln\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/lo.po b/document_url/i18n/lo.po
index c8437b0a6dc..926ecc0b78c 100644
--- a/document_url/i18n/lo.po
+++ b/document_url/i18n/lo.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Lao (https://www.transifex.com/oca/teams/23907/lo/)\n"
+"Language: lo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/lt.po b/document_url/i18n/lt.po
index 1f3dcb1ccd0..99369f4b114 100644
--- a/document_url/i18n/lt.po
+++ b/document_url/i18n/lt.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Lithuanian (https://www.transifex.com/oca/teams/23907/lt/)\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: document_url
 #: model:ir.ui.view,arch_db:document_url.view_ir_attachment_add_url_form
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/lv.po b/document_url/i18n/lv.po
index 604f6e6ac02..3790440208b 100644
--- a/document_url/i18n/lv.po
+++ b/document_url/i18n/lv.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Latvian (https://www.transifex.com/oca/teams/23907/lv/)\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
 #. module: document_url
 #: model:ir.ui.view,arch_db:document_url.view_ir_attachment_add_url_form
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/mk.po b/document_url/i18n/mk.po
index 0e196d9df8c..1b1406638d9 100644
--- a/document_url/i18n/mk.po
+++ b/document_url/i18n/mk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Macedonian (https://www.transifex.com/oca/teams/23907/mk/)\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/mn.po b/document_url/i18n/mn.po
index ae1d81a3471..f3a3ab74758 100644
--- a/document_url/i18n/mn.po
+++ b/document_url/i18n/mn.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Mongolian (https://www.transifex.com/oca/teams/23907/mn/)\n"
+"Language: mn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/nb.po b/document_url/i18n/nb.po
index 0a47d1ec7ef..662dd9427b5 100644
--- a/document_url/i18n/nb.po
+++ b/document_url/i18n/nb.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/nb/)\n"
+"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/"
+"nb/)\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/nl.po b/document_url/i18n/nl.po
index 8dc5eff3f22..5bf14feb5d8 100644
--- a/document_url/i18n/nl.po
+++ b/document_url/i18n/nl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/nl_BE.po b/document_url/i18n/nl_BE.po
index da4a52ba235..c0219f71ac2 100644
--- a/document_url/i18n/nl_BE.po
+++ b/document_url/i18n/nl_BE.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/nl_BE/)\n"
+"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/"
+"nl_BE/)\n"
+"Language: nl_BE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/pl.po b/document_url/i18n/pl.po
index c26d78adb7c..7a8cc2b378e 100644
--- a/document_url/i18n/pl.po
+++ b/document_url/i18n/pl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Polish (https://www.transifex.com/oca/teams/23907/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #. module: document_url
 #: model:ir.ui.view,arch_db:document_url.view_ir_attachment_add_url_form
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/pt.po b/document_url/i18n/pt.po
index df674d9f851..8e9cfd80420 100644
--- a/document_url/i18n/pt.po
+++ b/document_url/i18n/pt.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/pt_BR.po b/document_url/i18n/pt_BR.po
index 02ebdfe8185..ee6fa9fac3a 100644
--- a/document_url/i18n/pt_BR.po
+++ b/document_url/i18n/pt_BR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/23907/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/"
+"teams/23907/pt_BR/)\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/pt_PT.po b/document_url/i18n/pt_PT.po
index 656e0ae01f2..263b7b5acd1 100644
--- a/document_url/i18n/pt_PT.po
+++ b/document_url/i18n/pt_PT.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-13 13:00+0000\n"
 "PO-Revision-Date: 2016-08-13 13:00+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/teams/23907/pt_PT/)\n"
+"Language-Team: Portuguese (Portugal) (https://www.transifex.com/oca/"
+"teams/23907/pt_PT/)\n"
+"Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/ro.po b/document_url/i18n/ro.po
index 616711a518e..971d7575803 100644
--- a/document_url/i18n/ro.po
+++ b/document_url/i18n/ro.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
 
 #. module: document_url
 #: model:ir.ui.view,arch_db:document_url.view_ir_attachment_add_url_form
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/ru.po b/document_url/i18n/ru.po
index eb1dab155b9..d08e0db1f45 100644
--- a/document_url/i18n/ru.po
+++ b/document_url/i18n/ru.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,13 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Russian (https://www.transifex.com/oca/teams/23907/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. module: document_url
 #: model:ir.ui.view,arch_db:document_url.view_ir_attachment_add_url_form
@@ -31,7 +33,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/sk.po b/document_url/i18n/sk.po
index 8ff24733d82..8e1bd8abc4c 100644
--- a/document_url/i18n/sk.po
+++ b/document_url/i18n/sk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Slovak (https://www.transifex.com/oca/teams/23907/sk/)\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/sl.po b/document_url/i18n/sl.po
index 38ecd77bf35..4e84d0ae768 100644
--- a/document_url/i18n/sl.po
+++ b/document_url/i18n/sl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2016-08-13 13:00+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 
 #. module: document_url
 #: model:ir.ui.view,arch_db:document_url.view_ir_attachment_add_url_form
@@ -31,7 +32,7 @@ msgstr "Dodaj URL povezavo"
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr "Dodaj URL povezavo..."
diff --git a/document_url/i18n/sr.po b/document_url/i18n/sr.po
index 5b4af545aea..caf699a8d62 100644
--- a/document_url/i18n/sr.po
+++ b/document_url/i18n/sr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Serbian (https://www.transifex.com/oca/teams/23907/sr/)\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: document_url
 #: model:ir.ui.view,arch_db:document_url.view_ir_attachment_add_url_form
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/sr@latin.po b/document_url/i18n/sr@latin.po
index bc6be63d347..681cb80f86c 100644
--- a/document_url/i18n/sr@latin.po
+++ b/document_url/i18n/sr@latin.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,12 +11,14 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/sr@latin/)\n"
+"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/"
+"sr@latin/)\n"
+"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: document_url
 #: model:ir.ui.view,arch_db:document_url.view_ir_attachment_add_url_form
@@ -31,7 +33,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/sv.po b/document_url/i18n/sv.po
index d1458c7d17a..46b5af2ad27 100644
--- a/document_url/i18n/sv.po
+++ b/document_url/i18n/sv.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Swedish (https://www.transifex.com/oca/teams/23907/sv/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/th.po b/document_url/i18n/th.po
index 9947e8dfabf..029d54b7bbe 100644
--- a/document_url/i18n/th.po
+++ b/document_url/i18n/th.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Thai (https://www.transifex.com/oca/teams/23907/th/)\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/tr.po b/document_url/i18n/tr.po
index c3ff9b67f35..dfc7cf9c670 100644
--- a/document_url/i18n/tr.po
+++ b/document_url/i18n/tr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/uk.po b/document_url/i18n/uk.po
index ea132fcc038..b5f3bad74d6 100644
--- a/document_url/i18n/uk.po
+++ b/document_url/i18n/uk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,11 +12,12 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Ukrainian (https://www.transifex.com/oca/teams/23907/uk/)\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: document_url
 #: model:ir.ui.view,arch_db:document_url.view_ir_attachment_add_url_form
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/vi.po b/document_url/i18n/vi.po
index 2d8f39c2a07..fe3f140ad6e 100644
--- a/document_url/i18n/vi.po
+++ b/document_url/i18n/vi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -12,10 +12,10 @@ msgstr ""
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
 "Language-Team: Vietnamese (https://www.transifex.com/oca/teams/23907/vi/)\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: document_url
@@ -31,7 +31,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/zh_CN.po b/document_url/i18n/zh_CN.po
index 8613feab045..e022f84b617 100644
--- a/document_url/i18n/zh_CN.po
+++ b/document_url/i18n/zh_CN.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/"
+"zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/document_url/i18n/zh_TW.po b/document_url/i18n/zh_TW.po
index 70b2b8db2c3..cc89d9d9371 100644
--- a/document_url/i18n/zh_TW.po
+++ b/document_url/i18n/zh_TW.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * document_url
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2016
 msgid ""
@@ -11,11 +11,12 @@ msgstr ""
 "POT-Creation-Date: 2016-08-11 02:46+0000\n"
 "PO-Revision-Date: 2016-08-11 02:46+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2016\n"
-"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/"
+"zh_TW/)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: document_url
@@ -31,7 +32,7 @@ msgstr ""
 
 #. module: document_url
 #. openerp-web
-#: code:addons/document_url/static/src/xml/url.xml:4
+#: code:addons/document_url/static/src/xml/url.xml:5
 #, python-format
 msgid "Add URL..."
 msgstr ""
diff --git a/knowledge/i18n/am.po b/knowledge/i18n/am.po
index 4ee2009bf19..47e8da2484a 100644
--- a/knowledge/i18n/am.po
+++ b/knowledge/i18n/am.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,53 +10,33 @@ msgstr ""
 "POT-Creation-Date: 2016-08-13 13:00+0000\n"
 "PO-Revision-Date: 2016-09-09 12:26+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Amharic (http://www.transifex.com/oca/OCA-knowledge-9-0/language/am/)\n"
+"Language-Team: Amharic (http://www.transifex.com/oca/OCA-knowledge-9-0/"
+"language/am/)\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: am\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "ማመልከት"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "መሰረዝ"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "ማስተካከያዎች"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -64,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -76,39 +56,29 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Creado por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Creado en"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
 msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -118,63 +88,86 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Última actualización por"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Última actualización en"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "ወይም"
+#~ msgid "Apply"
+#~ msgstr "ማመልከት"
+
+#~ msgid "Cancel"
+#~ msgstr "መሰረዝ"
+
+#~ msgid "Created by"
+#~ msgstr "Creado por"
+
+#~ msgid "Created on"
+#~ msgstr "Creado en"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Última actualización por"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Última actualización en"
+
+#~ msgid "or"
+#~ msgstr "ወይም"
diff --git a/knowledge/i18n/ar.po b/knowledge/i18n/ar.po
index b2681e9981e..2deecc8687a 100644
--- a/knowledge/i18n/ar.po
+++ b/knowledge/i18n/ar.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,32 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Arabic (https://www.transifex.com/oca/teams/23907/ar/)\n"
+"Language: ar\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ar\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "تطبيق"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "إلغاء"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "الإعدادات"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "ضبط المعرفة"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "أنشئ بواسطة"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "أنشئ في"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "المستندات"
 
@@ -107,14 +76,10 @@ msgstr "المستندات"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "المعرف"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "المعرفة"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr "المعرفة وإدارة المستندات"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "آخر تحديث بواسطة"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "آخر تحديث في"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "المعرفة"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "إدارة المستندات"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "أو"
+#~ msgid "Apply"
+#~ msgstr "تطبيق"
+
+#~ msgid "Cancel"
+#~ msgstr "إلغاء"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "ضبط المعرفة"
+
+#~ msgid "Created by"
+#~ msgstr "أنشئ بواسطة"
+
+#~ msgid "Created on"
+#~ msgstr "أنشئ في"
+
+#~ msgid "ID"
+#~ msgstr "المعرف"
+
+#~ msgid "Last Updated by"
+#~ msgstr "آخر تحديث بواسطة"
+
+#~ msgid "Last Updated on"
+#~ msgstr "آخر تحديث في"
+
+#~ msgid "or"
+#~ msgstr "أو"
diff --git a/knowledge/i18n/bg.po b/knowledge/i18n/bg.po
index e0bfda162f1..5c5a8733a99 100644
--- a/knowledge/i18n/bg.po
+++ b/knowledge/i18n/bg.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Bulgarian (https://www.transifex.com/oca/teams/23907/bg/)\n"
+"Language: bg\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: bg\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Приложи"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Откажи"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Настройка"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Създадено от"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Създадено на"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Документи"
 
@@ -107,14 +75,10 @@ msgstr "Документи"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Знания"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Последно обновено от"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Последно обновено на"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Знания"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "или"
+#~ msgid "Apply"
+#~ msgstr "Приложи"
+
+#~ msgid "Cancel"
+#~ msgstr "Откажи"
+
+#~ msgid "Created by"
+#~ msgstr "Създадено от"
+
+#~ msgid "Created on"
+#~ msgstr "Създадено на"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Последно обновено от"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Последно обновено на"
+
+#~ msgid "or"
+#~ msgstr "или"
diff --git a/knowledge/i18n/bs.po b/knowledge/i18n/bs.po
index 01e8b3a49db..c9714753ece 100644
--- a/knowledge/i18n/bs.po
+++ b/knowledge/i18n/bs.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,32 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Bosnian (https://www.transifex.com/oca/teams/23907/bs/)\n"
+"Language: bs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: bs\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Primjeni"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Otkaži"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Konfiguracija"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Kreirao"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Kreirano"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr ""
 
@@ -107,14 +76,10 @@ msgstr ""
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Znanje"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr ""
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Znanje"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,47 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "ili"
+#~ msgid "Apply"
+#~ msgstr "Primjeni"
+
+#~ msgid "Cancel"
+#~ msgstr "Otkaži"
+
+#~ msgid "Created by"
+#~ msgstr "Kreirao"
+
+#~ msgid "Created on"
+#~ msgstr "Kreirano"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "or"
+#~ msgstr "ili"
diff --git a/knowledge/i18n/ca.po b/knowledge/i18n/ca.po
index 9b70898fcf0..377c7ffc0e4 100644
--- a/knowledge/i18n/ca.po
+++ b/knowledge/i18n/ca.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Catalan (https://www.transifex.com/oca/teams/23907/ca/)\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancel·la"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuració"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Creat per"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Creat el"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documents"
 
@@ -107,14 +75,10 @@ msgstr "Documents"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Coneixement"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Darrera Actualització per"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Darrera Actualització el"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Coneixement"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,47 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "Cancel·la"
+
+#~ msgid "Created by"
+#~ msgstr "Creat per"
+
+#~ msgid "Created on"
+#~ msgstr "Creat el"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Darrera Actualització per"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Darrera Actualització el"
diff --git a/knowledge/i18n/cs.po b/knowledge/i18n/cs.po
index 8351cbf841c..b8bcfcac7f3 100644
--- a/knowledge/i18n/cs.po
+++ b/knowledge/i18n/cs.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Czech (https://www.transifex.com/oca/teams/23907/cs/)\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: cs\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Použít"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Zrušit"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Nastavení"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Nastavit znalosti"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Vytvořil(a)"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Vytvořeno"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokumenty"
 
@@ -107,14 +75,10 @@ msgstr "Dokumenty"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Znalosti"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Správa znalostí a dokumentů"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Naposled upraveno"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Naposled upraveno"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Znalosti"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Spravovat dokumenty"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "nebo"
+#~ msgid "Apply"
+#~ msgstr "Použít"
+
+#~ msgid "Cancel"
+#~ msgstr "Zrušit"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Nastavit znalosti"
+
+#~ msgid "Created by"
+#~ msgstr "Vytvořil(a)"
+
+#~ msgid "Created on"
+#~ msgstr "Vytvořeno"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Naposled upraveno"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Naposled upraveno"
+
+#~ msgid "or"
+#~ msgstr "nebo"
diff --git a/knowledge/i18n/da.po b/knowledge/i18n/da.po
index 0c8130d8673..6d75422055c 100644
--- a/knowledge/i18n/da.po
+++ b/knowledge/i18n/da.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Danish (https://www.transifex.com/oca/teams/23907/da/)\n"
+"Language: da\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Anvend"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Annuller"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Konfiguration"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Oprettet af"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Oprettet den"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokumenter"
 
@@ -107,14 +75,10 @@ msgstr "Dokumenter"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "Id"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Viden"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Sidst opdateret af"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Sidst opdateret den"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Viden"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "eller"
+#~ msgid "Apply"
+#~ msgstr "Anvend"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuller"
+
+#~ msgid "Created by"
+#~ msgstr "Oprettet af"
+
+#~ msgid "Created on"
+#~ msgstr "Oprettet den"
+
+#~ msgid "ID"
+#~ msgstr "Id"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Sidst opdateret af"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Sidst opdateret den"
+
+#~ msgid "or"
+#~ msgstr "eller"
diff --git a/knowledge/i18n/de.po b/knowledge/i18n/de.po
index 071cb3f6a2a..4a5f0935398 100644
--- a/knowledge/i18n/de.po
+++ b/knowledge/i18n/de.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 # Niki Waibel <niki.waibel@gmail.com>, 2017
@@ -13,14 +13,14 @@ msgstr ""
 "PO-Revision-Date: 2017-03-28 03:34+0000\n"
 "Last-Translator: Niki Waibel <niki.waibel@gmail.com>, 2017\n"
 "Language-Team: German (https://www.transifex.com/oca/teams/23907/de/)\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
@@ -29,33 +29,17 @@ msgstr ""
 "- Das Modul document_page_approval wird installiert."
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Anwenden"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr "Dateien aus externem DMS in Odoo einbinden"
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Abbrechen"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Konfiguration"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Konfiguriere Dokumentenmanagement"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -66,7 +50,7 @@ msgstr ""
 "- Das Modul cmis-read wird installiert."
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -81,22 +65,7 @@ msgid "Connect with an external DMS"
 msgstr "Mit externem DMS verbinden"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Erstellt durch"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Erstellt am"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr "Anzeigename"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -109,7 +78,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokumente"
 
@@ -118,14 +86,10 @@ msgstr "Dokumente"
 msgid "Group by"
 msgstr "Gruppiert durch"
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Dokumente"
 
@@ -140,37 +104,25 @@ msgid "Knowledge user"
 msgstr "Wissender Benutzer"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr "Zuletzt aktualisiert am"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Zuletzt aktualisiert von"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Zuletzt aktualisiert am"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr "Dokumentseiten verwalten (Wiki)"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Dokumentenverwaltung"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr "Dokumentenfreigabe verwalten"
 
@@ -180,7 +132,7 @@ msgid "Model"
 msgstr "Modell"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
@@ -189,31 +141,59 @@ msgstr ""
 "- Das Modul document_page wird installiert."
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr "Einstellungen"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr "Speichere Anhänge auf externem DMS anstelle der Odoo-Dateiablage"
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr "Verwende CMIS"
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr "ir.attachment"
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+#, fuzzy
+msgid "res.config.settings"
 msgstr "knowledge.config.settings"
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "oder"
+#~ msgid "Apply"
+#~ msgstr "Anwenden"
+
+#~ msgid "Cancel"
+#~ msgstr "Abbrechen"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Konfiguriere Dokumentenmanagement"
+
+#~ msgid "Created by"
+#~ msgstr "Erstellt durch"
+
+#~ msgid "Created on"
+#~ msgstr "Erstellt am"
+
+#~ msgid "Display Name"
+#~ msgstr "Anzeigename"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Zuletzt aktualisiert am"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Zuletzt aktualisiert von"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Zuletzt aktualisiert am"
+
+#~ msgid "Using CMIS"
+#~ msgstr "Verwende CMIS"
+
+#~ msgid "or"
+#~ msgstr "oder"
diff --git a/knowledge/i18n/el.po b/knowledge/i18n/el.po
index 1bbe087ad24..92bc75acc67 100644
--- a/knowledge/i18n/el.po
+++ b/knowledge/i18n/el.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Greek (https://www.transifex.com/oca/teams/23907/el/)\n"
+"Language: el\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Εφαρμογή"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Ακύρωση"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Ρυθμίσεις"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Δημιουργήθηκε από"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Δημιουργήθηκε στις"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Έγγραφα"
 
@@ -107,14 +75,10 @@ msgstr "Έγγραφα"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "Κωδικός"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Γνωσιακή"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Τελευταία Αναβαθμίστηκε από"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Τελευταία Αναβαθμίστηκε στις"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Γνωσιακή"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "ή"
+#~ msgid "Apply"
+#~ msgstr "Εφαρμογή"
+
+#~ msgid "Cancel"
+#~ msgstr "Ακύρωση"
+
+#~ msgid "Created by"
+#~ msgstr "Δημιουργήθηκε από"
+
+#~ msgid "Created on"
+#~ msgstr "Δημιουργήθηκε στις"
+
+#~ msgid "ID"
+#~ msgstr "Κωδικός"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Τελευταία Αναβαθμίστηκε από"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Τελευταία Αναβαθμίστηκε στις"
+
+#~ msgid "or"
+#~ msgstr "ή"
diff --git a/knowledge/i18n/el_GR.po b/knowledge/i18n/el_GR.po
index d616a83076d..96713b9fdff 100644
--- a/knowledge/i18n/el_GR.po
+++ b/knowledge/i18n/el_GR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,53 +10,33 @@ msgstr ""
 "POT-Creation-Date: 2016-08-13 13:00+0000\n"
 "PO-Revision-Date: 2016-09-09 12:26+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Greek (Greece) (http://www.transifex.com/oca/OCA-knowledge-9-0/language/el_GR/)\n"
+"Language-Team: Greek (Greece) (http://www.transifex.com/oca/OCA-"
+"knowledge-9-0/language/el_GR/)\n"
+"Language: el_GR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: el_GR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -64,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -76,39 +56,29 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Δημιουργήθηκε από "
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Δημιουργήθηκε στις"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
 msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "Κωδικός"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -118,63 +88,77 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Τελευταία ενημέρωση από"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Τελευταία ενημέρωση στις"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr ""
+#~ msgid "Created by"
+#~ msgstr "Δημιουργήθηκε από "
+
+#~ msgid "Created on"
+#~ msgstr "Δημιουργήθηκε στις"
+
+#~ msgid "ID"
+#~ msgstr "Κωδικός"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Τελευταία ενημέρωση από"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Τελευταία ενημέρωση στις"
diff --git a/knowledge/i18n/en_AU.po b/knowledge/i18n/en_AU.po
index 1a494db3c46..909355494d6 100644
--- a/knowledge/i18n/en_AU.po
+++ b/knowledge/i18n/en_AU.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,33 +10,24 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:04+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: English (Australia) (http://www.transifex.com/oca/OCA-knowledge-9-0/language/en_AU/)\n"
+"Language-Team: English (Australia) (http://www.transifex.com/oca/OCA-"
+"knowledge-9-0/language/en_AU/)\n"
+"Language: en_AU\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: en_AU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Apply"
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancel"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -45,55 +36,49 @@ msgid "Configuration"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
-"Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
+msgid ""
+"Document indexation, full text search of attachements.\n"
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
 msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -103,53 +88,71 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "or"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#~ msgid "Apply"
+#~ msgstr "Apply"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel"
+
+#~ msgid "or"
+#~ msgstr "or"
diff --git a/knowledge/i18n/en_GB.po b/knowledge/i18n/en_GB.po
index 219b7ef2ac0..daf7416cf4b 100644
--- a/knowledge/i18n/en_GB.po
+++ b/knowledge/i18n/en_GB.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/teams/23907/en_GB/)\n"
+"Language-Team: English (United Kingdom) (https://www.transifex.com/oca/"
+"teams/23907/en_GB/)\n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: en_GB\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Apply"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancel"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuration"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Created by"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Created on"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documents"
 
@@ -107,14 +76,10 @@ msgstr "Documents"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Knowledge"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Last Updated by"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Last Updated on"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Knowledge"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "or"
+#~ msgid "Apply"
+#~ msgstr "Apply"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancel"
+
+#~ msgid "Created by"
+#~ msgstr "Created by"
+
+#~ msgid "Created on"
+#~ msgstr "Created on"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Last Updated by"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Last Updated on"
+
+#~ msgid "or"
+#~ msgstr "or"
diff --git a/knowledge/i18n/es.po b/knowledge/i18n/es.po
index b92b6964a38..6bd5c0128c3 100644
--- a/knowledge/i18n/es.po
+++ b/knowledge/i18n/es.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Spanish (https://www.transifex.com/oca/teams/23907/es/)\n"
+"Language: es\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Aplicar"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuración"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Configurar base de conocimiento"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Creado por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Creado en"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr "Nombre mostrado"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documentos"
 
@@ -107,14 +75,10 @@ msgstr "Documentos"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Conocimiento"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Gestión de documentos y de la base de conocimiento"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr "Modificado por última vez el"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Última actualización de"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Última actualización en"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Conocimiento"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr "Gestionar páginas de documento (Wiki)"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Gestión de documentos"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr "Gestionar aprobación de documentos"
 
@@ -164,38 +122,63 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr "Ajustes"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+#, fuzzy
+msgid "res.config.settings"
 msgstr "knowledge.config.settings"
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "o"
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Configurar base de conocimiento"
+
+#~ msgid "Created by"
+#~ msgstr "Creado por"
+
+#~ msgid "Created on"
+#~ msgstr "Creado en"
+
+#~ msgid "Display Name"
+#~ msgstr "Nombre mostrado"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Modificado por última vez el"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Última actualización de"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Última actualización en"
+
+#~ msgid "or"
+#~ msgstr "o"
diff --git a/knowledge/i18n/es_AR.po b/knowledge/i18n/es_AR.po
index 0a098545fb6..5d01b3628c1 100644
--- a/knowledge/i18n/es_AR.po
+++ b/knowledge/i18n/es_AR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/teams/23907/es_AR/)\n"
+"Language-Team: Spanish (Argentina) (https://www.transifex.com/oca/"
+"teams/23907/es_AR/)\n"
+"Language: es_AR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_AR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Aplicar"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuración"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Configurar Conocimiento"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Creado por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Creado en"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documentos"
 
@@ -107,14 +76,10 @@ msgstr "Documentos"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Conocimientos"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Gestión de Documentos y Conocimientos"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Última actualización realizada por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Última actualización el"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Conocimientos"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Administrar documentos"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "o"
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Configurar Conocimiento"
+
+#~ msgid "Created by"
+#~ msgstr "Creado por"
+
+#~ msgid "Created on"
+#~ msgstr "Creado en"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Última actualización realizada por"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Última actualización el"
+
+#~ msgid "or"
+#~ msgstr "o"
diff --git a/knowledge/i18n/es_CL.po b/knowledge/i18n/es_CL.po
index 2e82d40fdd5..bd5186f32e6 100644
--- a/knowledge/i18n/es_CL.po
+++ b/knowledge/i18n/es_CL.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,33 +10,24 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:05+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Spanish (Chile) (http://www.transifex.com/oca/OCA-knowledge-9-0/language/es_CL/)\n"
+"Language-Team: Spanish (Chile) (http://www.transifex.com/oca/OCA-"
+"knowledge-9-0/language/es_CL/)\n"
+"Language: es_CL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -45,55 +36,49 @@ msgid "Configuration"
 msgstr "Configuración"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
-"Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
+msgid ""
+"Document indexation, full text search of attachements.\n"
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
 msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -103,53 +88,65 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
 msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
diff --git a/knowledge/i18n/es_CO.po b/knowledge/i18n/es_CO.po
index 94b34a78b43..570418a4dae 100644
--- a/knowledge/i18n/es_CO.po
+++ b/knowledge/i18n/es_CO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/es_CO/)\n"
+"Language-Team: Spanish (Colombia) (https://www.transifex.com/oca/teams/23907/"
+"es_CO/)\n"
+"Language: es_CO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Aplicar"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documentos"
 
@@ -107,14 +76,10 @@ msgstr "Documentos"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -124,37 +89,30 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,41 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "o"
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "or"
+#~ msgstr "o"
diff --git a/knowledge/i18n/es_CR.po b/knowledge/i18n/es_CR.po
index 5c7460f6a11..e5df1fdf2f3 100644
--- a/knowledge/i18n/es_CR.po
+++ b/knowledge/i18n/es_CR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/teams/23907/es_CR/)\n"
+"Language-Team: Spanish (Costa Rica) (https://www.transifex.com/oca/"
+"teams/23907/es_CR/)\n"
+"Language: es_CR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_CR\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Aplicar"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuración"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Creado por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Creado en"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documentos"
 
@@ -107,14 +76,10 @@ msgstr "Documentos"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Conocimiento"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Ultima actualización por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Ultima actualización en"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Conocimiento"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "o"
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Created by"
+#~ msgstr "Creado por"
+
+#~ msgid "Created on"
+#~ msgstr "Creado en"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Ultima actualización por"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Ultima actualización en"
+
+#~ msgid "or"
+#~ msgstr "o"
diff --git a/knowledge/i18n/es_DO.po b/knowledge/i18n/es_DO.po
index 17e0005721d..6032b947f98 100644
--- a/knowledge/i18n/es_DO.po
+++ b/knowledge/i18n/es_DO.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/teams/23907/es_DO/)\n"
+"Language-Team: Spanish (Dominican Republic) (https://www.transifex.com/oca/"
+"teams/23907/es_DO/)\n"
+"Language: es_DO\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_DO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Aplicar"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuración"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr ""
 
@@ -107,14 +76,10 @@ msgstr ""
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID (identificación)"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Conocimiento"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr ""
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Conocimiento"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,41 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "ó"
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "ID"
+#~ msgstr "ID (identificación)"
+
+#~ msgid "or"
+#~ msgstr "ó"
diff --git a/knowledge/i18n/es_EC.po b/knowledge/i18n/es_EC.po
index 43dc1c55b33..ca12219c9d8 100644
--- a/knowledge/i18n/es_EC.po
+++ b/knowledge/i18n/es_EC.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/es_EC/)\n"
+"Language-Team: Spanish (Ecuador) (https://www.transifex.com/oca/teams/23907/"
+"es_EC/)\n"
+"Language: es_EC\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_EC\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Aplicar"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuración"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr ""
 
@@ -107,14 +76,10 @@ msgstr ""
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Gestión de Conocimiento"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr ""
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Gestión de Conocimiento"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,41 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "o"
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "or"
+#~ msgstr "o"
diff --git a/knowledge/i18n/es_ES.po b/knowledge/i18n/es_ES.po
index 95c6f25eaec..a276b99a7d1 100644
--- a/knowledge/i18n/es_ES.po
+++ b/knowledge/i18n/es_ES.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,53 +10,33 @@ msgstr ""
 "POT-Creation-Date: 2016-08-13 13:00+0000\n"
 "PO-Revision-Date: 2016-09-09 12:25+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Spanish (Spain) (http://www.transifex.com/oca/OCA-knowledge-9-0/language/es_ES/)\n"
+"Language-Team: Spanish (Spain) (http://www.transifex.com/oca/OCA-"
+"knowledge-9-0/language/es_ES/)\n"
+"Language: es_ES\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -64,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -76,39 +56,29 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Creado por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Creado en"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
 msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -118,63 +88,80 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Última actualización por"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Última actualización en"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Created by"
+#~ msgstr "Creado por"
+
+#~ msgid "Created on"
+#~ msgstr "Creado en"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Última actualización por"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Última actualización en"
diff --git a/knowledge/i18n/es_MX.po b/knowledge/i18n/es_MX.po
index 2a5bec95df3..ec063548251 100644
--- a/knowledge/i18n/es_MX.po
+++ b/knowledge/i18n/es_MX.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/es_MX/)\n"
+"Language-Team: Spanish (Mexico) (https://www.transifex.com/oca/teams/23907/"
+"es_MX/)\n"
+"Language: es_MX\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_MX\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Aplicar"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuración"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Creado por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Creado en"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documentos"
 
@@ -107,14 +76,10 @@ msgstr "Documentos"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Conocimiento"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Ultima actualización por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Ultima actualización en"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Conocimiento"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "o"
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Created by"
+#~ msgstr "Creado por"
+
+#~ msgid "Created on"
+#~ msgstr "Creado en"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Ultima actualización por"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Ultima actualización en"
+
+#~ msgid "or"
+#~ msgstr "o"
diff --git a/knowledge/i18n/es_PY.po b/knowledge/i18n/es_PY.po
index 0278a58878a..9744d77096f 100644
--- a/knowledge/i18n/es_PY.po
+++ b/knowledge/i18n/es_PY.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/es_PY/)\n"
+"Language-Team: Spanish (Paraguay) (https://www.transifex.com/oca/teams/23907/"
+"es_PY/)\n"
+"Language: es_PY\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_PY\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuración"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documentos"
 
@@ -107,14 +76,10 @@ msgstr "Documentos"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -124,37 +89,30 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,35 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "ID"
+#~ msgstr "ID"
diff --git a/knowledge/i18n/es_VE.po b/knowledge/i18n/es_VE.po
index 557150cca09..96ac537997b 100644
--- a/knowledge/i18n/es_VE.po
+++ b/knowledge/i18n/es_VE.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/teams/23907/es_VE/)\n"
+"Language-Team: Spanish (Venezuela) (https://www.transifex.com/oca/"
+"teams/23907/es_VE/)\n"
+"Language: es_VE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: es_VE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuración"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Creado por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Creado en"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documentos"
 
@@ -107,14 +76,10 @@ msgstr "Documentos"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Conocimiento"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Ultima actualización por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Ultima actualización en"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Conocimiento"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,47 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Created by"
+#~ msgstr "Creado por"
+
+#~ msgid "Created on"
+#~ msgstr "Creado en"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Ultima actualización por"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Ultima actualización en"
diff --git a/knowledge/i18n/et.po b/knowledge/i18n/et.po
index 7ef87eff504..6af69678091 100644
--- a/knowledge/i18n/et.po
+++ b/knowledge/i18n/et.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2014
 msgid ""
@@ -11,33 +11,24 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:05+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Estonian (http://www.transifex.com/oca/OCA-knowledge-9-0/language/et/)\n"
+"Language-Team: Estonian (http://www.transifex.com/oca/OCA-knowledge-9-0/"
+"language/et/)\n"
+"Language: et\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: et\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Kinnita"
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Loobu"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -46,55 +37,49 @@ msgid "Configuration"
 msgstr "Seadistused"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
+msgid ""
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Loodud"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
 msgstr ""
 
 #. module: knowledge
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Documents"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
 msgid "Knowledge"
 msgstr ""
 
@@ -104,53 +89,77 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "või"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#~ msgid "Apply"
+#~ msgstr "Kinnita"
+
+#~ msgid "Cancel"
+#~ msgstr "Loobu"
+
+#~ msgid "Created on"
+#~ msgstr "Loodud"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "or"
+#~ msgstr "või"
diff --git a/knowledge/i18n/eu.po b/knowledge/i18n/eu.po
index a048c03a642..077fd490e18 100644
--- a/knowledge/i18n/eu.po
+++ b/knowledge/i18n/eu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # Oihane Crucelaegui <oihanecruce@gmail.com>, 2015
 msgid ""
@@ -11,33 +11,24 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:04+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Basque (http://www.transifex.com/oca/OCA-knowledge-9-0/language/eu/)\n"
+"Language-Team: Basque (http://www.transifex.com/oca/OCA-knowledge-9-0/"
+"language/eu/)\n"
+"Language: eu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Ezeztatu"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -46,55 +37,49 @@ msgid "Configuration"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
+msgid ""
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
 msgstr ""
 
 #. module: knowledge
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Documents"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
 msgid "Knowledge"
 msgstr ""
 
@@ -104,53 +89,71 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "edo"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#~ msgid "Cancel"
+#~ msgstr "Ezeztatu"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "or"
+#~ msgstr "edo"
diff --git a/knowledge/i18n/fa.po b/knowledge/i18n/fa.po
index 5077d63abee..e6a44636946 100644
--- a/knowledge/i18n/fa.po
+++ b/knowledge/i18n/fa.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Persian (https://www.transifex.com/oca/teams/23907/fa/)\n"
+"Language: fa\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "اعمال"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "لغو"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "پیکربندی"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "ایجاد شده توسط"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "ایجاد شده در"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "اسناد"
 
@@ -107,14 +75,10 @@ msgstr "اسناد"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "شناسه"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "دانش"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "آخرین به روز رسانی توسط"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "آخرین به روز رسانی در"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "دانش"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "یا"
+#~ msgid "Apply"
+#~ msgstr "اعمال"
+
+#~ msgid "Cancel"
+#~ msgstr "لغو"
+
+#~ msgid "Created by"
+#~ msgstr "ایجاد شده توسط"
+
+#~ msgid "Created on"
+#~ msgstr "ایجاد شده در"
+
+#~ msgid "ID"
+#~ msgstr "شناسه"
+
+#~ msgid "Last Updated by"
+#~ msgstr "آخرین به روز رسانی توسط"
+
+#~ msgid "Last Updated on"
+#~ msgstr "آخرین به روز رسانی در"
+
+#~ msgid "or"
+#~ msgstr "یا"
diff --git a/knowledge/i18n/fi.po b/knowledge/i18n/fi.po
index 0b29b022fdf..fc219099a15 100644
--- a/knowledge/i18n/fi.po
+++ b/knowledge/i18n/fi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Finnish (https://www.transifex.com/oca/teams/23907/fi/)\n"
+"Language: fi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Hyväksy"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Peruuta"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Konfiguraatio"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Konfiguroi tietämyksenhallinta -moduuli"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Luonut"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Luotu"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr "Nimi"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokumentit"
 
@@ -107,14 +75,10 @@ msgstr "Dokumentit"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Tietämys"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Tietämyksen ja asiakirjojen -hallinta"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr "Viimeksi muokattu"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Viimeksi päivittänyt"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Viimeksi päivitetty"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Tietämys"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Hallitse dokumentteja"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,62 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "tai"
+#~ msgid "Apply"
+#~ msgstr "Hyväksy"
+
+#~ msgid "Cancel"
+#~ msgstr "Peruuta"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Konfiguroi tietämyksenhallinta -moduuli"
+
+#~ msgid "Created by"
+#~ msgstr "Luonut"
+
+#~ msgid "Created on"
+#~ msgstr "Luotu"
+
+#~ msgid "Display Name"
+#~ msgstr "Nimi"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Viimeksi muokattu"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Viimeksi päivittänyt"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Viimeksi päivitetty"
+
+#~ msgid "or"
+#~ msgstr "tai"
diff --git a/knowledge/i18n/fr.po b/knowledge/i18n/fr.po
index 8becc9c9de0..c2132d2a02b 100644
--- a/knowledge/i18n/fr.po
+++ b/knowledge/i18n/fr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: French (https://www.transifex.com/oca/teams/23907/fr/)\n"
+"Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Appliquer"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Annuler"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuration"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Configurer la base de connaissances"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Créé par"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Créé le"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr "Nom affiché"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documents"
 
@@ -107,14 +75,10 @@ msgstr "Documents"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Connaissances"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Base de connaissance et documentaire"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr "Dernière mise à jour le"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Dernière modification par"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Dernière mise à jour le"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Connaissances"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr "Gérer des pages (wiki)"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Gérer les documents"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr "Gérer l'approbation sur les pages"
 
@@ -164,38 +122,63 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr "Paramètres"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+#, fuzzy
+msgid "res.config.settings"
 msgstr "knowledge.config.settings"
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "ou"
+#~ msgid "Apply"
+#~ msgstr "Appliquer"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Configurer la base de connaissances"
+
+#~ msgid "Created by"
+#~ msgstr "Créé par"
+
+#~ msgid "Created on"
+#~ msgstr "Créé le"
+
+#~ msgid "Display Name"
+#~ msgstr "Nom affiché"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Dernière mise à jour le"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Dernière modification par"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Dernière mise à jour le"
+
+#~ msgid "or"
+#~ msgstr "ou"
diff --git a/knowledge/i18n/fr_CA.po b/knowledge/i18n/fr_CA.po
index 854e26131da..d79992115cc 100644
--- a/knowledge/i18n/fr_CA.po
+++ b/knowledge/i18n/fr_CA.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,33 +10,24 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:05+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: French (Canada) (http://www.transifex.com/oca/OCA-knowledge-9-0/language/fr_CA/)\n"
+"Language-Team: French (Canada) (http://www.transifex.com/oca/OCA-"
+"knowledge-9-0/language/fr_CA/)\n"
+"Language: fr_CA\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: fr_CA\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Appliquer"
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Annuler"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -45,55 +36,49 @@ msgid "Configuration"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Créé par"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Créé le"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
-"Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
+msgid ""
+"Document indexation, full text search of attachements.\n"
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
 msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "Identifiant"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -103,53 +88,86 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Dernière mise à jour par"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Dernière mise à jour le"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "ou"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#~ msgid "Apply"
+#~ msgstr "Appliquer"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuler"
+
+#~ msgid "Created by"
+#~ msgstr "Créé par"
+
+#~ msgid "Created on"
+#~ msgstr "Créé le"
+
+#~ msgid "ID"
+#~ msgstr "Identifiant"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Dernière mise à jour par"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Dernière mise à jour le"
+
+#~ msgid "or"
+#~ msgstr "ou"
diff --git a/knowledge/i18n/gl.po b/knowledge/i18n/gl.po
index f6744814cea..fa02d02262b 100644
--- a/knowledge/i18n/gl.po
+++ b/knowledge/i18n/gl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Galician (https://www.transifex.com/oca/teams/23907/gl/)\n"
+"Language: gl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuración"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Creado por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Creado o"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documentos"
 
@@ -107,14 +75,10 @@ msgstr "Documentos"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Coñecemento"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "ültima actualización por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Última actualización en"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Coñecemento"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,50 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "ou"
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Created by"
+#~ msgstr "Creado por"
+
+#~ msgid "Created on"
+#~ msgstr "Creado o"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "ültima actualización por"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Última actualización en"
+
+#~ msgid "or"
+#~ msgstr "ou"
diff --git a/knowledge/i18n/gu.po b/knowledge/i18n/gu.po
index 39ed6b7a5ca..0cf4c098eb2 100644
--- a/knowledge/i18n/gu.po
+++ b/knowledge/i18n/gu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Gujarati (https://www.transifex.com/oca/teams/23907/gu/)\n"
+"Language: gu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: gu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "રદ કરો"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "રુપરેખાંકન"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "દસ્તાવેજો"
 
@@ -107,14 +75,10 @@ msgstr "દસ્તાવેજો"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ઓળખ"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -124,37 +88,30 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +121,35 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "રદ કરો"
+
+#~ msgid "ID"
+#~ msgstr "ઓળખ"
diff --git a/knowledge/i18n/he.po b/knowledge/i18n/he.po
index 9866f6c196b..9eebba5d811 100644
--- a/knowledge/i18n/he.po
+++ b/knowledge/i18n/he.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hebrew (https://www.transifex.com/oca/teams/23907/he/)\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "החל"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "בטל"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "הגדרות תצורה"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "נוצר על ידי"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "נוצר ב-"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "מסמכים"
 
@@ -107,14 +75,10 @@ msgstr "מסמכים"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "מזהה"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "ידע"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "עודכן לאחרונה על ידי"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "עודכן לאחרונה על"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "ידע"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "או"
+#~ msgid "Apply"
+#~ msgstr "החל"
+
+#~ msgid "Cancel"
+#~ msgstr "בטל"
+
+#~ msgid "Created by"
+#~ msgstr "נוצר על ידי"
+
+#~ msgid "Created on"
+#~ msgstr "נוצר ב-"
+
+#~ msgid "ID"
+#~ msgstr "מזהה"
+
+#~ msgid "Last Updated by"
+#~ msgstr "עודכן לאחרונה על ידי"
+
+#~ msgid "Last Updated on"
+#~ msgstr "עודכן לאחרונה על"
+
+#~ msgid "or"
+#~ msgstr "או"
diff --git a/knowledge/i18n/hi.po b/knowledge/i18n/hi.po
index 70421a883f1..27da12e9ab2 100644
--- a/knowledge/i18n/hi.po
+++ b/knowledge/i18n/hi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hindi (https://www.transifex.com/oca/teams/23907/hi/)\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "रद्द"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "कॉन्फ़िगरेशन"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr ""
 
@@ -107,14 +75,10 @@ msgstr ""
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "ज्ञान"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr ""
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "ज्ञान"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,32 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "रद्द"
diff --git a/knowledge/i18n/hr.po b/knowledge/i18n/hr.po
index 15a7b3fb830..d8776e2cdd9 100644
--- a/knowledge/i18n/hr.po
+++ b/knowledge/i18n/hr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,32 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Croatian (https://www.transifex.com/oca/teams/23907/hr/)\n"
+"Language: hr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hr\n"
-"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
+"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Primjeni"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Odustani"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Postavke"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Kreirao"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Vrijeme kreiranja"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokumenti"
 
@@ -107,14 +76,10 @@ msgstr "Dokumenti"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Znanje"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Upravljanje znanjem i dokumentima"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Promijenio"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Vrijeme promjene"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Znanje"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Dokumenti"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "ili"
+#~ msgid "Apply"
+#~ msgstr "Primjeni"
+
+#~ msgid "Cancel"
+#~ msgstr "Odustani"
+
+#~ msgid "Created by"
+#~ msgstr "Kreirao"
+
+#~ msgid "Created on"
+#~ msgstr "Vrijeme kreiranja"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Promijenio"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Vrijeme promjene"
+
+#~ msgid "or"
+#~ msgstr "ili"
diff --git a/knowledge/i18n/hu.po b/knowledge/i18n/hu.po
index 06b463a2d96..8584ccfe3f3 100644
--- a/knowledge/i18n/hu.po
+++ b/knowledge/i18n/hu.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Hungarian (https://www.transifex.com/oca/teams/23907/hu/)\n"
+"Language: hu\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Alkalmaz"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Mégsem"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Beállítások"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Tudástár beállítása"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Készítette"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Létrehozás dátuma"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokumentumok"
 
@@ -107,14 +75,10 @@ msgstr "Dokumentumok"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "Azonosító ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Tudás"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Tudástár és dokumentum kezelés"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Utoljára frissítve, által"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Utoljára frissítve ekkor"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Tudás"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Dokumentum kezelés"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "vagy"
+#~ msgid "Apply"
+#~ msgstr "Alkalmaz"
+
+#~ msgid "Cancel"
+#~ msgstr "Mégsem"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Tudástár beállítása"
+
+#~ msgid "Created by"
+#~ msgstr "Készítette"
+
+#~ msgid "Created on"
+#~ msgstr "Létrehozás dátuma"
+
+#~ msgid "ID"
+#~ msgstr "Azonosító ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Utoljára frissítve, által"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Utoljára frissítve ekkor"
+
+#~ msgid "or"
+#~ msgstr "vagy"
diff --git a/knowledge/i18n/hy.po b/knowledge/i18n/hy.po
index 2d3f17585c6..6ea43ea606e 100644
--- a/knowledge/i18n/hy.po
+++ b/knowledge/i18n/hy.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,33 +10,24 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:05+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Armenian (http://www.transifex.com/oca/OCA-knowledge-9-0/language/hy/)\n"
+"Language-Team: Armenian (http://www.transifex.com/oca/OCA-knowledge-9-0/"
+"language/hy/)\n"
+"Language: hy\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Ավելացնել"
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Հրաժարվել"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -45,55 +36,49 @@ msgid "Configuration"
 msgstr "Կոնֆիգուրացիա"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
-"Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
+msgid ""
+"Document indexation, full text search of attachements.\n"
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
 msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -103,53 +88,68 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
 msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#~ msgid "Apply"
+#~ msgstr "Ավելացնել"
+
+#~ msgid "Cancel"
+#~ msgstr "Հրաժարվել"
diff --git a/knowledge/i18n/id.po b/knowledge/i18n/id.po
index 0ca28a6fa54..2e9b43d95d4 100644
--- a/knowledge/i18n/id.po
+++ b/knowledge/i18n/id.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # Dhaman <dhaman@indonesian-odoo.com>, 2015
 msgid ""
@@ -11,33 +11,24 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:04+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Indonesian (http://www.transifex.com/oca/OCA-knowledge-9-0/language/id/)\n"
+"Language-Team: Indonesian (http://www.transifex.com/oca/OCA-knowledge-9-0/"
+"language/id/)\n"
+"Language: id\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: id\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Terapkan"
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Batalkan"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -46,55 +37,49 @@ msgid "Configuration"
 msgstr "Konfigurasi"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Dibuat oleh"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Dibuat pada"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
-"Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
+msgid ""
+"Document indexation, full text search of attachements.\n"
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
 msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -104,53 +89,86 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Diperbaharui oleh"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Diperbaharui pada"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "atau"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#~ msgid "Apply"
+#~ msgstr "Terapkan"
+
+#~ msgid "Cancel"
+#~ msgstr "Batalkan"
+
+#~ msgid "Created by"
+#~ msgstr "Dibuat oleh"
+
+#~ msgid "Created on"
+#~ msgstr "Dibuat pada"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Diperbaharui oleh"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Diperbaharui pada"
+
+#~ msgid "or"
+#~ msgstr "atau"
diff --git a/knowledge/i18n/is.po b/knowledge/i18n/is.po
index d0fadad06ee..7ab34385af5 100644
--- a/knowledge/i18n/is.po
+++ b/knowledge/i18n/is.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,33 +10,24 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:05+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Icelandic (http://www.transifex.com/oca/OCA-knowledge-9-0/language/is/)\n"
+"Language-Team: Icelandic (http://www.transifex.com/oca/OCA-knowledge-9-0/"
+"language/is/)\n"
+"Language: is\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: is\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -45,55 +36,49 @@ msgid "Configuration"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Búið til af"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
+msgid ""
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
 msgstr ""
 
 #. module: knowledge
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Documents"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "Auðkenni"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
 msgid "Knowledge"
 msgstr ""
 
@@ -103,53 +88,68 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
 msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#~ msgid "Created by"
+#~ msgstr "Búið til af"
+
+#~ msgid "ID"
+#~ msgstr "Auðkenni"
diff --git a/knowledge/i18n/it.po b/knowledge/i18n/it.po
index 1c6f27d3e39..dc346d57afa 100644
--- a/knowledge/i18n/it.po
+++ b/knowledge/i18n/it.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Italian (https://www.transifex.com/oca/teams/23907/it/)\n"
+"Language: it\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Salva"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Annulla"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configurazione"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Configura Knowledge"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Creato da"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Creato il"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr "Nome da visualizzare"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documenti"
 
@@ -107,14 +75,10 @@ msgstr "Documenti"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Know how"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Knowledge e Gestione documentale"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr "Ultima modifica il"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Ultima modifica di"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Ultima modifica il"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Know how"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Gestione documenti"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,62 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "o"
+#~ msgid "Apply"
+#~ msgstr "Salva"
+
+#~ msgid "Cancel"
+#~ msgstr "Annulla"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Configura Knowledge"
+
+#~ msgid "Created by"
+#~ msgstr "Creato da"
+
+#~ msgid "Created on"
+#~ msgstr "Creato il"
+
+#~ msgid "Display Name"
+#~ msgstr "Nome da visualizzare"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Ultima modifica il"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Ultima modifica di"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Ultima modifica il"
+
+#~ msgid "or"
+#~ msgstr "o"
diff --git a/knowledge/i18n/ja.po b/knowledge/i18n/ja.po
index 7378adb01b4..3d18e53b9c6 100644
--- a/knowledge/i18n/ja.po
+++ b/knowledge/i18n/ja.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Japanese (https://www.transifex.com/oca/teams/23907/ja/)\n"
+"Language: ja\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ja\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "適用"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "取消"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "設定"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "作成者"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "作成日"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "文書"
 
@@ -107,14 +75,10 @@ msgstr "文書"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "ナレッジ"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "最終更新者"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "最終更新日"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "ナレッジ"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "または"
+#~ msgid "Apply"
+#~ msgstr "適用"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "Created by"
+#~ msgstr "作成者"
+
+#~ msgid "Created on"
+#~ msgstr "作成日"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "最終更新者"
+
+#~ msgid "Last Updated on"
+#~ msgstr "最終更新日"
+
+#~ msgid "or"
+#~ msgstr "または"
diff --git a/knowledge/i18n/ka.po b/knowledge/i18n/ka.po
index 6e30e5eb018..6d95b1c0d4e 100644
--- a/knowledge/i18n/ka.po
+++ b/knowledge/i18n/ka.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,33 +10,24 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:05+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Georgian (http://www.transifex.com/oca/OCA-knowledge-9-0/language/ka/)\n"
+"Language-Team: Georgian (http://www.transifex.com/oca/OCA-knowledge-9-0/"
+"language/ka/)\n"
+"Language: ka\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ka\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "გააქტიურება"
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "შეწყვეტა"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -45,55 +36,49 @@ msgid "Configuration"
 msgstr "კონფიგურაცია"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
+msgid ""
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
 msgstr ""
 
 #. module: knowledge
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Documents"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "იდენტიფიკატორი"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
 msgid "Knowledge"
 msgstr ""
 
@@ -103,53 +88,71 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
+
+#~ msgid "Apply"
+#~ msgstr "გააქტიურება"
+
+#~ msgid "Cancel"
+#~ msgstr "შეწყვეტა"
+
+#~ msgid "ID"
+#~ msgstr "იდენტიფიკატორი"
diff --git a/knowledge/i18n/kab.po b/knowledge/i18n/kab.po
index 2b607447747..b6adf023f41 100644
--- a/knowledge/i18n/kab.po
+++ b/knowledge/i18n/kab.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Kabyle (https://www.transifex.com/oca/teams/23907/kab/)\n"
+"Language: kab\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: kab\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Snes"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Sefsex"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Tawila"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Swel Tamusni"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Yerna-t"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Yerna di"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Arraten"
 
@@ -107,14 +75,10 @@ msgstr "Arraten"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "Asulay"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Tamusni"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Asefrek n tmusni d warraten"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Aleqqem aneggaru sɣuṛ"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Aleqqem aneggaru di"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Tamusni"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Sefrek arraten"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "neɣ"
+#~ msgid "Apply"
+#~ msgstr "Snes"
+
+#~ msgid "Cancel"
+#~ msgstr "Sefsex"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Swel Tamusni"
+
+#~ msgid "Created by"
+#~ msgstr "Yerna-t"
+
+#~ msgid "Created on"
+#~ msgstr "Yerna di"
+
+#~ msgid "ID"
+#~ msgstr "Asulay"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Aleqqem aneggaru sɣuṛ"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Aleqqem aneggaru di"
+
+#~ msgid "or"
+#~ msgstr "neɣ"
diff --git a/knowledge/i18n/kk.po b/knowledge/i18n/kk.po
index 58d0cfbad06..bca98258a09 100644
--- a/knowledge/i18n/kk.po
+++ b/knowledge/i18n/kk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,33 +10,24 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:05+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Kazakh (http://www.transifex.com/oca/OCA-knowledge-9-0/language/kk/)\n"
+"Language-Team: Kazakh (http://www.transifex.com/oca/OCA-knowledge-9-0/"
+"language/kk/)\n"
+"Language: kk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: kk\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Бас тарту"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -45,55 +36,49 @@ msgid "Configuration"
 msgstr "Баптау"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
-"Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
+msgid ""
+"Document indexation, full text search of attachements.\n"
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
 msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -103,53 +88,65 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
 msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#~ msgid "Cancel"
+#~ msgstr "Бас тарту"
diff --git a/knowledge/i18n/ko.po b/knowledge/i18n/ko.po
index 8b87c4e2094..23c101ddeca 100644
--- a/knowledge/i18n/ko.po
+++ b/knowledge/i18n/ko.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Korean (https://www.transifex.com/oca/teams/23907/ko/)\n"
+"Language: ko\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "적용"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "취소"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "환경 설정"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "지식 구성"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "작성자"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "작성일"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "문서"
 
@@ -107,14 +75,10 @@ msgstr "문서"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "지식"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "지식 및 문서 관리"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "최근 갱신한 사람"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "최근 갱신 날짜"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "지식"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "문서 관리"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "또는"
+#~ msgid "Apply"
+#~ msgstr "적용"
+
+#~ msgid "Cancel"
+#~ msgstr "취소"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "지식 구성"
+
+#~ msgid "Created by"
+#~ msgstr "작성자"
+
+#~ msgid "Created on"
+#~ msgstr "작성일"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "최근 갱신한 사람"
+
+#~ msgid "Last Updated on"
+#~ msgstr "최근 갱신 날짜"
+
+#~ msgid "or"
+#~ msgstr "또는"
diff --git a/knowledge/i18n/ln.po b/knowledge/i18n/ln.po
index f8943c60725..1a542a63000 100644
--- a/knowledge/i18n/ln.po
+++ b/knowledge/i18n/ln.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,33 +10,24 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:04+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Lingala (http://www.transifex.com/oca/OCA-knowledge-9-0/language/ln/)\n"
+"Language-Team: Lingala (http://www.transifex.com/oca/OCA-knowledge-9-0/"
+"language/ln/)\n"
+"Language: ln\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ln\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Tika"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -45,55 +36,49 @@ msgid "Configuration"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
+msgid ""
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
 msgstr ""
 
 #. module: knowledge
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Documents"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
 msgid "Knowledge"
 msgstr ""
 
@@ -103,53 +88,68 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
 msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#~ msgid "Cancel"
+#~ msgstr "Tika"
+
+#~ msgid "ID"
+#~ msgstr "ID"
diff --git a/knowledge/i18n/lo.po b/knowledge/i18n/lo.po
index 8c0253e4913..750c17ccdbe 100644
--- a/knowledge/i18n/lo.po
+++ b/knowledge/i18n/lo.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Lao (https://www.transifex.com/oca/teams/23907/lo/)\n"
+"Language: lo\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lo\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "ຍົກເລີອກ"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "ການກໍານົດຄ່າ"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr ""
 
@@ -107,14 +75,10 @@ msgstr ""
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "ການຄຸ້ມຄອງເອກະສານ"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr ""
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "ການຄຸ້ມຄອງເອກະສານ"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,35 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "ຫຼື"
+#~ msgid "Cancel"
+#~ msgstr "ຍົກເລີອກ"
+
+#~ msgid "or"
+#~ msgstr "ຫຼື"
diff --git a/knowledge/i18n/lt.po b/knowledge/i18n/lt.po
index d7175d1da53..7d14deb3c4d 100644
--- a/knowledge/i18n/lt.po
+++ b/knowledge/i18n/lt.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,33 +10,25 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:05+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Lithuanian (http://www.transifex.com/oca/OCA-knowledge-9-0/language/lt/)\n"
+"Language-Team: Lithuanian (http://www.transifex.com/oca/OCA-knowledge-9-0/"
+"language/lt/)\n"
+"Language: lt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lt\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n"
+"%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Taikyti"
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Atšaukti"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -45,55 +37,49 @@ msgid "Configuration"
 msgstr "Nustatymai"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Sukūrė"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Sukurta"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
-"Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
+msgid ""
+"Document indexation, full text search of attachements.\n"
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
 msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -103,53 +89,86 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Paskutini kartą atnaujino"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Paskutinį kartą atnaujinta"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "arba"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#~ msgid "Apply"
+#~ msgstr "Taikyti"
+
+#~ msgid "Cancel"
+#~ msgstr "Atšaukti"
+
+#~ msgid "Created by"
+#~ msgstr "Sukūrė"
+
+#~ msgid "Created on"
+#~ msgstr "Sukurta"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Paskutini kartą atnaujino"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Paskutinį kartą atnaujinta"
+
+#~ msgid "or"
+#~ msgstr "arba"
diff --git a/knowledge/i18n/lv.po b/knowledge/i18n/lv.po
index ff6be30134b..abc8dfe02ce 100644
--- a/knowledge/i18n/lv.po
+++ b/knowledge/i18n/lv.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,32 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Latvian (https://www.transifex.com/oca/teams/23907/lv/)\n"
+"Language: lv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: lv\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : "
+"2);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Pielietot"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Atcelt"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Uzstādījumi"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Izveidoja"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Izveidots"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokumenti"
 
@@ -107,14 +76,10 @@ msgstr "Dokumenti"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -124,37 +89,30 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Pēdējo reizi atjaunoja"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Pēdējās izmaiņas"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "vai"
+#~ msgid "Apply"
+#~ msgstr "Pielietot"
+
+#~ msgid "Cancel"
+#~ msgstr "Atcelt"
+
+#~ msgid "Created by"
+#~ msgstr "Izveidoja"
+
+#~ msgid "Created on"
+#~ msgstr "Izveidots"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Pēdējo reizi atjaunoja"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Pēdējās izmaiņas"
+
+#~ msgid "or"
+#~ msgstr "vai"
diff --git a/knowledge/i18n/mk.po b/knowledge/i18n/mk.po
index 4908a0c9eb9..2f71e11e18b 100644
--- a/knowledge/i18n/mk.po
+++ b/knowledge/i18n/mk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Macedonian (https://www.transifex.com/oca/teams/23907/mk/)\n"
+"Language: mk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Примени"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Откажи"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Конфигурација"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Конфигурирај го Знаење"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Креирано од"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Креирано на"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Документи"
 
@@ -107,14 +75,10 @@ msgstr "Документи"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Знаење"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Менаџирање на знаење и документи"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Последно ажурирање од"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Последно ажурирање на"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Знаење"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Менаџирај документи"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "или"
+#~ msgid "Apply"
+#~ msgstr "Примени"
+
+#~ msgid "Cancel"
+#~ msgstr "Откажи"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Конфигурирај го Знаење"
+
+#~ msgid "Created by"
+#~ msgstr "Креирано од"
+
+#~ msgid "Created on"
+#~ msgstr "Креирано на"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Последно ажурирање од"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Последно ажурирање на"
+
+#~ msgid "or"
+#~ msgstr "или"
diff --git a/knowledge/i18n/mn.po b/knowledge/i18n/mn.po
index 02690c4ee02..103fdcdb8d5 100644
--- a/knowledge/i18n/mn.po
+++ b/knowledge/i18n/mn.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Mongolian (https://www.transifex.com/oca/teams/23907/mn/)\n"
+"Language: mn\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: mn\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Ашиглах"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Цуцлах"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Тохиргоо"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Баримтын Тохиргоо"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Үүсгэгч"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Үүсгэсэн огноо"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Баримтууд"
 
@@ -107,14 +75,10 @@ msgstr "Баримтууд"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Баримт"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Бичиг Баримт, Мэдлэгийн менежмент"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Сүүлийн засвар хийсэн"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Сүүлийн засвар хийсэн огноо"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Баримт"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Бичиг баримтуудыг менежмент хийх"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "эсвэл"
+#~ msgid "Apply"
+#~ msgstr "Ашиглах"
+
+#~ msgid "Cancel"
+#~ msgstr "Цуцлах"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Баримтын Тохиргоо"
+
+#~ msgid "Created by"
+#~ msgstr "Үүсгэгч"
+
+#~ msgid "Created on"
+#~ msgstr "Үүсгэсэн огноо"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Сүүлийн засвар хийсэн"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Сүүлийн засвар хийсэн огноо"
+
+#~ msgid "or"
+#~ msgstr "эсвэл"
diff --git a/knowledge/i18n/nb.po b/knowledge/i18n/nb.po
index f795e1b21a8..66d6703e9cc 100644
--- a/knowledge/i18n/nb.po
+++ b/knowledge/i18n/nb.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/nb/)\n"
+"Language-Team: Norwegian Bokmål (https://www.transifex.com/oca/teams/23907/"
+"nb/)\n"
+"Language: nb\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Bruk"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Avbryt"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Konfigurasjon"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Opprettet av"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Opprettet"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokumenter"
 
@@ -107,14 +76,10 @@ msgstr "Dokumenter"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Kunnskap"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Sist oppdatert av"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Sist oppdatert"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Kunnskap"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "eller"
+#~ msgid "Apply"
+#~ msgstr "Bruk"
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "Created by"
+#~ msgstr "Opprettet av"
+
+#~ msgid "Created on"
+#~ msgstr "Opprettet"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Sist oppdatert av"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Sist oppdatert"
+
+#~ msgid "or"
+#~ msgstr "eller"
diff --git a/knowledge/i18n/nl.po b/knowledge/i18n/nl.po
index 6be29f6767f..2d08566147e 100644
--- a/knowledge/i18n/nl.po
+++ b/knowledge/i18n/nl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Dutch (https://www.transifex.com/oca/teams/23907/nl/)\n"
+"Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Toepassen"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Annuleren"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Instellingen"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Configureer Knowledge"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Aangemaakt door"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Aangemaakt op"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documenten"
 
@@ -107,14 +75,10 @@ msgstr "Documenten"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Kennis"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Document & Kennis Management"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Laatste bijgewerkt door"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Laatst bijgewerkt op"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Kennis"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Beheer documenten"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "of"
+#~ msgid "Apply"
+#~ msgstr "Toepassen"
+
+#~ msgid "Cancel"
+#~ msgstr "Annuleren"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Configureer Knowledge"
+
+#~ msgid "Created by"
+#~ msgstr "Aangemaakt door"
+
+#~ msgid "Created on"
+#~ msgstr "Aangemaakt op"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Laatste bijgewerkt door"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Laatst bijgewerkt op"
+
+#~ msgid "or"
+#~ msgstr "of"
diff --git a/knowledge/i18n/nl_BE.po b/knowledge/i18n/nl_BE.po
index f6ee7344934..853dc4b5864 100644
--- a/knowledge/i18n/nl_BE.po
+++ b/knowledge/i18n/nl_BE.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/nl_BE/)\n"
+"Language-Team: Dutch (Belgium) (https://www.transifex.com/oca/teams/23907/"
+"nl_BE/)\n"
+"Language: nl_BE\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl_BE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Toepassen"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Afbreken"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Instellingen"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Gemaakt door"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Gemaakt op"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr ""
 
@@ -107,14 +76,10 @@ msgstr ""
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Kennis"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Laatst bijgewerkt door"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Laatst bijgewerkt op"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Kennis"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "of"
+#~ msgid "Apply"
+#~ msgstr "Toepassen"
+
+#~ msgid "Cancel"
+#~ msgstr "Afbreken"
+
+#~ msgid "Created by"
+#~ msgstr "Gemaakt door"
+
+#~ msgid "Created on"
+#~ msgstr "Gemaakt op"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Laatst bijgewerkt door"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Laatst bijgewerkt op"
+
+#~ msgid "or"
+#~ msgstr "of"
diff --git a/knowledge/i18n/nl_NL.po b/knowledge/i18n/nl_NL.po
index 58b6b4c73fc..e88ef1a7e5c 100644
--- a/knowledge/i18n/nl_NL.po
+++ b/knowledge/i18n/nl_NL.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # Peter Hageman <hageman.p@gmail.com>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-03-28 03:34+0000\n"
 "PO-Revision-Date: 2017-03-28 03:34+0000\n"
 "Last-Translator: Peter Hageman <hageman.p@gmail.com>, 2017\n"
-"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/teams/23907/nl_NL/)\n"
+"Language-Team: Dutch (Netherlands) (https://www.transifex.com/oca/"
+"teams/23907/nl_NL/)\n"
+"Language: nl_NL\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: nl_NL\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr "Weergavenaam"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documenten"
 
@@ -107,14 +76,10 @@ msgstr "Documenten"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -129,37 +94,25 @@ msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr "Laatst aangepast op"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Laatst bijgewerkt door"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Laatst bijgewerkt op"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -169,38 +122,47 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "of"
+#~ msgid "Display Name"
+#~ msgstr "Weergavenaam"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Laatst aangepast op"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Laatst bijgewerkt door"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Laatst bijgewerkt op"
+
+#~ msgid "or"
+#~ msgstr "of"
diff --git a/knowledge/i18n/pl.po b/knowledge/i18n/pl.po
index 214eca778a8..593a729b345 100644
--- a/knowledge/i18n/pl.po
+++ b/knowledge/i18n/pl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,32 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Polish (https://www.transifex.com/oca/teams/23907/pl/)\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Zastosuj"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Anuluj"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Konfiguracja"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Skonfiguruj bibliotekę"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Utworzone przez"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Data utworzenia"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokumenty"
 
@@ -107,14 +76,10 @@ msgstr "Dokumenty"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Wiedza"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Zarządzanie wiedzą i dokumentami"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Ostatnio modyfikowane przez"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Data ostatniej modyfikacji"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Wiedza"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Zarządzaj dokumentami"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "lub"
+#~ msgid "Apply"
+#~ msgstr "Zastosuj"
+
+#~ msgid "Cancel"
+#~ msgstr "Anuluj"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Skonfiguruj bibliotekę"
+
+#~ msgid "Created by"
+#~ msgstr "Utworzone przez"
+
+#~ msgid "Created on"
+#~ msgstr "Data utworzenia"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Ostatnio modyfikowane przez"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Data ostatniej modyfikacji"
+
+#~ msgid "or"
+#~ msgstr "lub"
diff --git a/knowledge/i18n/pt.po b/knowledge/i18n/pt.po
index 158a780d161..20c5424acd9 100644
--- a/knowledge/i18n/pt.po
+++ b/knowledge/i18n/pt.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Portuguese (https://www.transifex.com/oca/teams/23907/pt/)\n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Aplicar"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuração"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Configurar Conhecimento"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Criado por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Criado em"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documentos"
 
@@ -107,14 +75,10 @@ msgstr "Documentos"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Conhecimento"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Gestão de Conhecimento e Documentos"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Última Actualização por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Última Actualização em"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Conhecimento"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Gerir documentos"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "ou"
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Configurar Conhecimento"
+
+#~ msgid "Created by"
+#~ msgstr "Criado por"
+
+#~ msgid "Created on"
+#~ msgstr "Criado em"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Última Actualização por"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Última Actualização em"
+
+#~ msgid "or"
+#~ msgstr "ou"
diff --git a/knowledge/i18n/pt_BR.po b/knowledge/i18n/pt_BR.po
index 965cf6aae14..5fefc694156 100644
--- a/knowledge/i18n/pt_BR.po
+++ b/knowledge/i18n/pt_BR.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,8 +11,8 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2018-06-21 03:20+0000\n"
 "Last-Translator: Rodrigo Macedo <rmsolucoeseminformatic4@gmail.com>\n"
-"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/teams/"
-"23907/pt_BR/)\n"
+"Language-Team: Portuguese (Brazil) (https://www.transifex.com/oca/"
+"teams/23907/pt_BR/)\n"
 "Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -21,7 +21,7 @@ msgstr ""
 "X-Generator: Weblate 3.0.1\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
@@ -30,33 +30,17 @@ msgstr ""
 "- Isso instala o módulo document_page_approval."
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Aplicar"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr "Anexar arquivos de um DMS externo no Odoo"
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configuração"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Configurar Conhecimento"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -67,7 +51,7 @@ msgstr ""
 "- Isso instala o módulo cmis_read."
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -81,22 +65,7 @@ msgid "Connect with an external DMS"
 msgstr "Conecte-se com um DMS externo"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Criado por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Criado em"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr "Mostrar nome"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -109,7 +78,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documentos"
 
@@ -118,14 +86,10 @@ msgstr "Documentos"
 msgid "Group by"
 msgstr "Agrupar por"
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Conhecimento"
 
@@ -135,37 +99,32 @@ msgid "Knowledge and Documents Management"
 msgstr "Gestão de Conhecimento e Documentos"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr "Última modificação em"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Última atualização por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Última atualização em"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Conhecimento"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr "Gerenciar páginas de documentos (Wiki)"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Gerenciar documentos"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+#, fuzzy
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr "Gerenciar documentos e aplicativos relacionados ao conhecimento"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr "Gerenciar aprovação de documentos"
 
@@ -175,7 +134,7 @@ msgid "Model"
 msgstr "Modelo"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
@@ -184,31 +143,58 @@ msgstr ""
 "- Isso instala o módulo document_page."
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr "Configurações"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr "Armazene anexos em um DMS externo em vez do Odoo Filestore"
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr "Usando CMIS"
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "ou"
+#~ msgid "Apply"
+#~ msgstr "Aplicar"
+
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Configurar Conhecimento"
+
+#~ msgid "Created by"
+#~ msgstr "Criado por"
+
+#~ msgid "Created on"
+#~ msgstr "Criado em"
+
+#~ msgid "Display Name"
+#~ msgstr "Mostrar nome"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Última modificação em"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Última atualização por"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Última atualização em"
+
+#~ msgid "Using CMIS"
+#~ msgstr "Usando CMIS"
+
+#~ msgid "or"
+#~ msgstr "ou"
diff --git a/knowledge/i18n/pt_PT.po b/knowledge/i18n/pt_PT.po
index 4cca0466458..09c764ee681 100644
--- a/knowledge/i18n/pt_PT.po
+++ b/knowledge/i18n/pt_PT.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,53 +10,33 @@ msgstr ""
 "POT-Creation-Date: 2016-08-13 13:00+0000\n"
 "PO-Revision-Date: 2016-03-12 13:02+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Portuguese (Portugal) (http://www.transifex.com/oca/OCA-knowledge-9-0/language/pt_PT/)\n"
+"Language-Team: Portuguese (Portugal) (http://www.transifex.com/oca/OCA-"
+"knowledge-9-0/language/pt_PT/)\n"
+"Language: pt_PT\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Cancelar"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -64,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -76,39 +56,29 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Criado por"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Criado em"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
 msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -118,63 +88,80 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Atualizado pela última vez por"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Atualizado pela última vez em"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "Cancelar"
+
+#~ msgid "Created by"
+#~ msgstr "Criado por"
+
+#~ msgid "Created on"
+#~ msgstr "Criado em"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Atualizado pela última vez por"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Atualizado pela última vez em"
diff --git a/knowledge/i18n/ro.po b/knowledge/i18n/ro.po
index 2dced345549..0f9224dcc50 100644
--- a/knowledge/i18n/ro.po
+++ b/knowledge/i18n/ro.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,32 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Romanian (https://www.transifex.com/oca/teams/23907/ro/)\n"
+"Language: ro\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ro\n"
-"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?"
+"2:1));\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Aplică"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Anulează"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Configurare"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Configureaza Cunostințele"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Creat de"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Creat la"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Documente"
 
@@ -107,14 +76,10 @@ msgstr "Documente"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Cunoștințe"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Managementul Cunostințelor și a Documentelor"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Ultima actualizare făcută de"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Ultima actualizare la"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Cunoștințe"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Gestioneaza documentele"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "sau"
+#~ msgid "Apply"
+#~ msgstr "Aplică"
+
+#~ msgid "Cancel"
+#~ msgstr "Anulează"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Configureaza Cunostințele"
+
+#~ msgid "Created by"
+#~ msgstr "Creat de"
+
+#~ msgid "Created on"
+#~ msgstr "Creat la"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Ultima actualizare făcută de"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Ultima actualizare la"
+
+#~ msgid "or"
+#~ msgstr "sau"
diff --git a/knowledge/i18n/ru.po b/knowledge/i18n/ru.po
index 19948119efd..78124ac1330 100644
--- a/knowledge/i18n/ru.po
+++ b/knowledge/i18n/ru.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,33 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Russian (https://www.transifex.com/oca/teams/23907/ru/)\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: ru\n"
-"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Применить"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Отменить"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Настройка"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Настройка знаний"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +46,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +58,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Создано"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Создан"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +69,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Документы"
 
@@ -107,14 +77,10 @@ msgstr "Документы"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Знания"
 
@@ -124,37 +90,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Управление знаниями и документами"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Последний раз обновлено"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Последний раз обновлено"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Знания"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Управлять документами"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +124,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "или"
+#~ msgid "Apply"
+#~ msgstr "Применить"
+
+#~ msgid "Cancel"
+#~ msgstr "Отменить"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Настройка знаний"
+
+#~ msgid "Created by"
+#~ msgstr "Создано"
+
+#~ msgid "Created on"
+#~ msgstr "Создан"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Последний раз обновлено"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Последний раз обновлено"
+
+#~ msgid "or"
+#~ msgstr "или"
diff --git a/knowledge/i18n/sk.po b/knowledge/i18n/sk.po
index a51d1e3787c..5bca07e7beb 100644
--- a/knowledge/i18n/sk.po
+++ b/knowledge/i18n/sk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Slovak (https://www.transifex.com/oca/teams/23907/sk/)\n"
+"Language: sk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sk\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Zrušiť"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Nastavenie"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Vytvoril"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Vytvorené"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokumenty"
 
@@ -107,14 +75,10 @@ msgstr "Dokumenty"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -124,37 +88,30 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Naposledy upravoval"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Naposledy upravované"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +121,50 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "alebo"
+#~ msgid "Cancel"
+#~ msgstr "Zrušiť"
+
+#~ msgid "Created by"
+#~ msgstr "Vytvoril"
+
+#~ msgid "Created on"
+#~ msgstr "Vytvorené"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Naposledy upravoval"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Naposledy upravované"
+
+#~ msgid "or"
+#~ msgstr "alebo"
diff --git a/knowledge/i18n/sl.po b/knowledge/i18n/sl.po
index 5df059e9220..6af6b84e28c 100644
--- a/knowledge/i18n/sl.po
+++ b/knowledge/i18n/sl.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,14 +12,15 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Slovenian (https://www.transifex.com/oca/teams/23907/sl/)\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sl\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n"
+"%100==4 ? 2 : 3);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
@@ -28,33 +29,17 @@ msgstr ""
 "- namesti modul document_page_approval."
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Uveljavi"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr "Pripni datoteke iz zunanjega DMS v Odoo"
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Preklic"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Nastavitve"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Nastavitve baze znanja"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -65,7 +50,7 @@ msgstr ""
 "- namesti modul cmis_read."
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -79,22 +64,7 @@ msgid "Connect with an external DMS"
 msgstr "Poveži z zunanjim DMS"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Ustvaril"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Ustvarjeno"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr "Naziv prikaza"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -107,7 +77,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokumenti"
 
@@ -116,14 +85,10 @@ msgstr "Dokumenti"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Baza znanja"
 
@@ -133,37 +98,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Baza znanja in upravljanje dokumentov"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr "Zadnjič spremenjeno"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Zadnjič posodobil"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Zadnjič posodobljeno"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Baza znanja"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr "Upravljanje strani dokumentov (Wiki)"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Upravljanje dokumentov"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr "Upravljanje odobritev dokumentov"
 
@@ -173,7 +132,7 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
@@ -182,31 +141,59 @@ msgstr ""
 "- namesti modul document_page."
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr "Nastavitve"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr "Hrani priponke na zunanjem DMS namesto v Odoo Filestore"
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr "Uporaba CMIS"
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+#, fuzzy
+msgid "res.config.settings"
 msgstr "knowledge.config.settings"
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "ali"
+#~ msgid "Apply"
+#~ msgstr "Uveljavi"
+
+#~ msgid "Cancel"
+#~ msgstr "Preklic"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Nastavitve baze znanja"
+
+#~ msgid "Created by"
+#~ msgstr "Ustvaril"
+
+#~ msgid "Created on"
+#~ msgstr "Ustvarjeno"
+
+#~ msgid "Display Name"
+#~ msgstr "Naziv prikaza"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Modified on"
+#~ msgstr "Zadnjič spremenjeno"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Zadnjič posodobil"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Zadnjič posodobljeno"
+
+#~ msgid "Using CMIS"
+#~ msgstr "Uporaba CMIS"
+
+#~ msgid "or"
+#~ msgstr "ali"
diff --git a/knowledge/i18n/sr.po b/knowledge/i18n/sr.po
index 936d9f40e8b..d49f57badb5 100644
--- a/knowledge/i18n/sr.po
+++ b/knowledge/i18n/sr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,32 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Serbian (https://www.transifex.com/oca/teams/23907/sr/)\n"
+"Language: sr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sr\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Otkaži"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Konfiguracija"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Kreiran"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokumenti"
 
@@ -107,14 +76,10 @@ msgstr "Dokumenti"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Znanje"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr ""
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Znanje"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,38 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr ""
+#~ msgid "Cancel"
+#~ msgstr "Otkaži"
+
+#~ msgid "Created on"
+#~ msgstr "Kreiran"
+
+#~ msgid "ID"
+#~ msgstr "ID"
diff --git a/knowledge/i18n/sr@latin.po b/knowledge/i18n/sr@latin.po
index 4a4e409c8e5..fbf9316a137 100644
--- a/knowledge/i18n/sr@latin.po
+++ b/knowledge/i18n/sr@latin.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,34 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/sr@latin/)\n"
+"Language-Team: Serbian (Latin) (https://www.transifex.com/oca/teams/23907/"
+"sr@latin/)\n"
+"Language: sr@latin\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sr@latin\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Primeni"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Otkaži"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Podešavanje"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +46,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +58,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Kreiran"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +69,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokumenti"
 
@@ -107,14 +77,10 @@ msgstr "Dokumenti"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Znanje"
 
@@ -124,37 +90,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr ""
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Znanje"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +124,41 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr ""
+#~ msgid "Apply"
+#~ msgstr "Primeni"
+
+#~ msgid "Cancel"
+#~ msgstr "Otkaži"
+
+#~ msgid "Created on"
+#~ msgstr "Kreiran"
+
+#~ msgid "ID"
+#~ msgstr "ID"
diff --git a/knowledge/i18n/sv.po b/knowledge/i18n/sv.po
index 46a2638ebcb..b13e1906135 100644
--- a/knowledge/i18n/sv.po
+++ b/knowledge/i18n/sv.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Swedish (https://www.transifex.com/oca/teams/23907/sv/)\n"
+"Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Verkställ"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Avbryt"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Konfiguration"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Konfigurera kunskapssystemet"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Skapad av"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Skapad den"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Dokument"
 
@@ -107,14 +75,10 @@ msgstr "Dokument"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Kunskap"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Dokumenthantering och kunskapsutveckling"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Senast uppdaterad av"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Senast uppdaterad"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Kunskap"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Administrera dokument"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "eller"
+#~ msgid "Apply"
+#~ msgstr "Verkställ"
+
+#~ msgid "Cancel"
+#~ msgstr "Avbryt"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Konfigurera kunskapssystemet"
+
+#~ msgid "Created by"
+#~ msgstr "Skapad av"
+
+#~ msgid "Created on"
+#~ msgstr "Skapad den"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Senast uppdaterad av"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Senast uppdaterad"
+
+#~ msgid "or"
+#~ msgstr "eller"
diff --git a/knowledge/i18n/th.po b/knowledge/i18n/th.po
index c0c75b68583..3ccc013d61d 100644
--- a/knowledge/i18n/th.po
+++ b/knowledge/i18n/th.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Thai (https://www.transifex.com/oca/teams/23907/th/)\n"
+"Language: th\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: th\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "ปรับใช้"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "ยกเลิก"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "ตั้งค่า"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "สร้างโดย"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "สร้างเมื่อ"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "เอกสาร"
 
@@ -107,14 +75,10 @@ msgstr "เอกสาร"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "รหัส"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "ความรู้"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "อัพเดทครั้งสุดท้ายโดย"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "อัพเดทครั้งสุดท้ายเมื่อ"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "ความรู้"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,53 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "หรือ"
+#~ msgid "Apply"
+#~ msgstr "ปรับใช้"
+
+#~ msgid "Cancel"
+#~ msgstr "ยกเลิก"
+
+#~ msgid "Created by"
+#~ msgstr "สร้างโดย"
+
+#~ msgid "Created on"
+#~ msgstr "สร้างเมื่อ"
+
+#~ msgid "ID"
+#~ msgstr "รหัส"
+
+#~ msgid "Last Updated by"
+#~ msgstr "อัพเดทครั้งสุดท้ายโดย"
+
+#~ msgid "Last Updated on"
+#~ msgstr "อัพเดทครั้งสุดท้ายเมื่อ"
+
+#~ msgid "or"
+#~ msgstr "หรือ"
diff --git a/knowledge/i18n/tr.po b/knowledge/i18n/tr.po
index ed8bddbb49e..3ffec118819 100644
--- a/knowledge/i18n/tr.po
+++ b/knowledge/i18n/tr.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -12,47 +12,31 @@ msgstr ""
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
 "Language-Team: Turkish (https://www.transifex.com/oca/teams/23907/tr/)\n"
+"Language: tr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: tr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Uygula"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "İptal"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "Yapılandırma"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "Bilgi Birikimini Yapılandır"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +44,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +56,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Oluşturan"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Oluşturma"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +67,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "Belgeler"
 
@@ -107,14 +75,10 @@ msgstr "Belgeler"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "Bilgi Birikimi"
 
@@ -124,37 +88,31 @@ msgid "Knowledge and Documents Management"
 msgstr "Bilgi ve Belge Yönetimi"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Son Güncelleyen"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Son Güncelleme"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "Bilgi Birikimi"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "Belgeleri Yönet"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +122,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "ya da"
+#~ msgid "Apply"
+#~ msgstr "Uygula"
+
+#~ msgid "Cancel"
+#~ msgstr "İptal"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "Bilgi Birikimini Yapılandır"
+
+#~ msgid "Created by"
+#~ msgstr "Oluşturan"
+
+#~ msgid "Created on"
+#~ msgstr "Oluşturma"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Son Güncelleyen"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Son Güncelleme"
+
+#~ msgid "or"
+#~ msgstr "ya da"
diff --git a/knowledge/i18n/uk.po b/knowledge/i18n/uk.po
index 25183b56517..1d9cce8dfb2 100644
--- a/knowledge/i18n/uk.po
+++ b/knowledge/i18n/uk.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,33 +10,25 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:05+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/oca/OCA-knowledge-9-0/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/oca/OCA-knowledge-9-0/"
+"language/uk/)\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: uk\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Застосувати"
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Скасувати"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -45,55 +37,49 @@ msgid "Configuration"
 msgstr "Налаштування"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "Створив"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Створено"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
-"Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
+msgid ""
+"Document indexation, full text search of attachements.\n"
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
 msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr ""
 
@@ -103,53 +89,86 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "Востаннє відредаговано"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "Дата останньої зміни"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
+msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "або"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#~ msgid "Apply"
+#~ msgstr "Застосувати"
+
+#~ msgid "Cancel"
+#~ msgstr "Скасувати"
+
+#~ msgid "Created by"
+#~ msgstr "Створив"
+
+#~ msgid "Created on"
+#~ msgstr "Створено"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "Востаннє відредаговано"
+
+#~ msgid "Last Updated on"
+#~ msgstr "Дата останньої зміни"
+
+#~ msgid "or"
+#~ msgstr "або"
diff --git a/knowledge/i18n/vi.po b/knowledge/i18n/vi.po
index 66d1f6aefd4..49e72b72911 100644
--- a/knowledge/i18n/vi.po
+++ b/knowledge/i18n/vi.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 msgid ""
 msgstr ""
@@ -10,33 +10,24 @@ msgstr ""
 "POT-Creation-Date: 2015-12-09 18:03+0000\n"
 "PO-Revision-Date: 2015-12-09 18:05+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>\n"
-"Language-Team: Vietnamese (http://www.transifex.com/oca/OCA-knowledge-9-0/language/vi/)\n"
+"Language-Team: Vietnamese (http://www.transifex.com/oca/OCA-knowledge-9-0/"
+"language/vi/)\n"
+"Language: vi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
-"-This installs the module document_page_approval."
+"- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "Áp dụng"
-
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "Hủy bỏ"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document2
-msgid "Collaborative Content"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
+msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
 #. module: knowledge
@@ -45,55 +36,49 @@ msgid "Configuration"
 msgstr "Cấu hình"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
+msgid ""
+"Connect Odoo with a CMIS compatible server to attach files\n"
+"to an Odoo record.\n"
+"- This installs the module cmis_read."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
+msgid ""
+"Connect Odoo with a CMIS compatible server to store files.\n"
+"- This installs the module cmis_write."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "Tạo trên"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
+msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
-"-This installs the module document."
+"- This installs the module document."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document page approval"
+#: model:ir.actions.act_window,name:knowledge.knowledge_action_documents
+#: model:ir.ui.menu,name:knowledge.menu_document
+#: model:ir.ui.menu,name:knowledge.menu_document_section
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Document pages"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Group by"
 msgstr ""
 
 #. module: knowledge
+#: model:ir.module.category,name:knowledge.module_category_knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document_root
 #: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Documents"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
-#. module: knowledge
-#: model:ir.ui.menu,name:knowledge.menu_document
 msgid "Knowledge"
 msgstr ""
 
@@ -103,53 +88,77 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
+#: model:res.groups,name:knowledge.group_document_user
+msgid "Knowledge user"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
+msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
+msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
-msgid "Manage document pages (Wiki)"
+#: model:ir.module.category,description:knowledge.module_category_knowledge
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
-msgid "Manage documents"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
+msgid "Manage documents approval"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
-msgid "Manage documents approval"
+#: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
+msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
-"-This installs the module document_page."
+"- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
+msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "hoặc"
+#: model:ir.model,name:knowledge.model_ir_attachment
+msgid "ir.attachment"
+msgstr ""
+
+#. module: knowledge
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
+msgstr ""
+
+#~ msgid "Apply"
+#~ msgstr "Áp dụng"
+
+#~ msgid "Cancel"
+#~ msgstr "Hủy bỏ"
+
+#~ msgid "Created on"
+#~ msgstr "Tạo trên"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "or"
+#~ msgstr "hoặc"
diff --git a/knowledge/i18n/zh_CN.po b/knowledge/i18n/zh_CN.po
index ffe72bcb992..78b4118045f 100644
--- a/knowledge/i18n/zh_CN.po
+++ b/knowledge/i18n/zh_CN.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/zh_CN/)\n"
+"Language-Team: Chinese (China) (https://www.transifex.com/oca/teams/23907/"
+"zh_CN/)\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "应用"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "取消"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "配置"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr "配置知识库"
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr "创建人"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "创建"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "文档"
 
@@ -107,14 +76,10 @@ msgstr "文档"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "知识"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr "知识和文档管理"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr "最后更新"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr "最后一次更新"
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "知识"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr "管理文档"
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,56 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "或者"
+#~ msgid "Apply"
+#~ msgstr "应用"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "Configure Knowledge"
+#~ msgstr "配置知识库"
+
+#~ msgid "Created by"
+#~ msgstr "创建人"
+
+#~ msgid "Created on"
+#~ msgstr "创建"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "Last Updated by"
+#~ msgstr "最后更新"
+
+#~ msgid "Last Updated on"
+#~ msgstr "最后一次更新"
+
+#~ msgid "or"
+#~ msgstr "或者"
diff --git a/knowledge/i18n/zh_TW.po b/knowledge/i18n/zh_TW.po
index 146152a7c9c..1883f90b11c 100644
--- a/knowledge/i18n/zh_TW.po
+++ b/knowledge/i18n/zh_TW.po
@@ -1,7 +1,7 @@
 # Translation of Odoo Server.
 # This file contains the translation of the following modules:
 # * knowledge
-# 
+#
 # Translators:
 # OCA Transbot <transbot@odoo-community.org>, 2017
 msgid ""
@@ -11,48 +11,33 @@ msgstr ""
 "POT-Creation-Date: 2017-01-20 03:35+0000\n"
 "PO-Revision-Date: 2017-01-20 03:35+0000\n"
 "Last-Translator: OCA Transbot <transbot@odoo-community.org>, 2017\n"
-"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/zh_TW/)\n"
+"Language-Team: Chinese (Taiwan) (https://www.transifex.com/oca/teams/23907/"
+"zh_TW/)\n"
+"Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: \n"
-"Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page_approval
 msgid ""
 "Add workflow on documents per category.\n"
 "- This installs the module document_page_approval."
 msgstr ""
 
 #. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Apply"
-msgstr "套用"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_read
 msgid "Attach files from an external DMS into Odoo"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Cancel"
-msgstr "取消"
-
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_configuration
 msgid "Configuration"
 msgstr "設置"
 
 #. module: knowledge
-#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Configure Knowledge"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_read
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_read
 msgid ""
 "Connect Odoo with a CMIS compatible server to attach files\n"
 "to an Odoo record.\n"
@@ -60,7 +45,7 @@ msgid ""
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_cmis_write
 msgid ""
 "Connect Odoo with a CMIS compatible server to store files.\n"
 "- This installs the module cmis_write."
@@ -72,22 +57,7 @@ msgid "Connect with an external DMS"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_uid
-msgid "Created by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_create_date
-msgid "Created on"
-msgstr "建立於"
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_display_name
-msgid "Display Name"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document
 msgid ""
 "Document indexation, full text search of attachements.\n"
 "- This installs the module document."
@@ -98,7 +68,6 @@ msgstr ""
 #: model:ir.ui.menu,name:knowledge.menu_document
 #: model:ir.ui.menu,name:knowledge.menu_document_section
 #: model:ir.ui.view,arch_db:knowledge.ir_attachment_view_user_documents
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Documents"
 msgstr "文件"
 
@@ -107,14 +76,10 @@ msgstr "文件"
 msgid "Group by"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_id
-msgid "ID"
-msgstr "ID"
-
 #. module: knowledge
 #: model:ir.module.category,name:knowledge.module_category_knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document_root
+#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
 msgid "Knowledge"
 msgstr "知識"
 
@@ -124,37 +89,31 @@ msgid "Knowledge and Documents Management"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings___last_update
-msgid "Last Modified on"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_uid
-msgid "Last Updated by"
-msgstr ""
-
-#. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_write_date
-msgid "Last Updated on"
-msgstr ""
+#: model:res.groups,name:knowledge.group_document_user
+#, fuzzy
+msgid "Knowledge user"
+msgstr "知識"
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page
 msgid "Manage document pages (Wiki)"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document
 msgid "Manage documents"
 msgstr ""
 
 #. module: knowledge
 #: model:ir.module.category,description:knowledge.module_category_knowledge
-msgid "Manage documents and knowledge-related applications"
+msgid ""
+"Manage documents and knowledge-related\n"
+"            applications\n"
+"        "
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_document_page_approval
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_document_page_approval
 msgid "Manage documents approval"
 msgstr ""
 
@@ -164,38 +123,44 @@ msgid "Model"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,help:knowledge.field_knowledge_config_settings_module_document_page
+#: model:ir.model.fields,help:knowledge.field_res_config_settings_module_document_page
 msgid ""
 "Provide document page and category as a wiki.\n"
 "- This installs the module document_page."
 msgstr ""
 
 #. module: knowledge
+#: model:ir.actions.act_window,name:knowledge.action_knowledge_configuration
 #: model:ir.ui.menu,name:knowledge.menu_knowledge_configuration
 msgid "Settings"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model.fields,field_description:knowledge.field_knowledge_config_settings_module_cmis_write
+#: model:ir.model.fields,field_description:knowledge.field_res_config_settings_module_cmis_write
 msgid "Store attachments in an external DMS instead of the Odoo Filestore"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "Using CMIS"
-msgstr ""
-
 #. module: knowledge
 #: model:ir.model,name:knowledge.model_ir_attachment
 msgid "ir.attachment"
 msgstr ""
 
 #. module: knowledge
-#: model:ir.model,name:knowledge.model_knowledge_config_settings
-msgid "knowledge.config.settings"
+#: model:ir.model,name:knowledge.model_res_config_settings
+msgid "res.config.settings"
 msgstr ""
 
-#. module: knowledge
-#: model:ir.ui.view,arch_db:knowledge.view_knowledge_configuration
-msgid "or"
-msgstr "或"
+#~ msgid "Apply"
+#~ msgstr "套用"
+
+#~ msgid "Cancel"
+#~ msgstr "取消"
+
+#~ msgid "Created on"
+#~ msgstr "建立於"
+
+#~ msgid "ID"
+#~ msgstr "ID"
+
+#~ msgid "or"
+#~ msgstr "或"