Merged with latest.

bzr revid: tta@openerp.com-20120817104610-h7pova57capzm1by

39 files changed, 144 insertions, 98 deletions

diff --git a/addons/knowledge/__openerp__.py b/addons/knowledge/__openerp__.py
index dca620b0f07..f6b042f364b 100644
--- a/addons/knowledge/__openerp__.py
+++ b/addons/knowledge/__openerp__.py
@@ -21,7 +21,7 @@
 
 
 {
-    "name" : "Document Management System",
+    "name" : "Knowledge Management System",
     "version" : "1.0",
     "depends" : ["base","base_setup"],
     "author" : "OpenERP SA",
diff --git a/addons/knowledge/i18n/ar.po b/addons/knowledge/i18n/ar.po
index 7b2110e7c2c..98ca036c616 100644
--- a/addons/knowledge/i18n/ar.po
+++ b/addons/knowledge/i18n/ar.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/bg.po b/addons/knowledge/i18n/bg.po
index 12651d4d480..1baad7ea77e 100644
--- a/addons/knowledge/i18n/bg.po
+++ b/addons/knowledge/i18n/bg.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/ca.po b/addons/knowledge/i18n/ca.po
index 8a44291261c..f5a73abe934 100644
--- a/addons/knowledge/i18n/ca.po
+++ b/addons/knowledge/i18n/ca.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/cs.po b/addons/knowledge/i18n/cs.po
index c8ead27b2e6..2918863fae3 100644
--- a/addons/knowledge/i18n/cs.po
+++ b/addons/knowledge/i18n/cs.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 "X-Poedit-Language: Czech\n"
 
 #. module: knowledge
diff --git a/addons/knowledge/i18n/da.po b/addons/knowledge/i18n/da.po
index 5f362ff2749..eb1d7785457 100644
--- a/addons/knowledge/i18n/da.po
+++ b/addons/knowledge/i18n/da.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/de.po b/addons/knowledge/i18n/de.po
index f6ed4763079..5883cdc7d8f 100644
--- a/addons/knowledge/i18n/de.po
+++ b/addons/knowledge/i18n/de.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/en_GB.po b/addons/knowledge/i18n/en_GB.po
index 34358dd1fba..9f888c23345 100644
--- a/addons/knowledge/i18n/en_GB.po
+++ b/addons/knowledge/i18n/en_GB.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/es.po b/addons/knowledge/i18n/es.po
index a4b1bc26867..a0f94867f64 100644
--- a/addons/knowledge/i18n/es.po
+++ b/addons/knowledge/i18n/es.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/es_AR.po b/addons/knowledge/i18n/es_AR.po
index 67ac2907a39..55c5df202c0 100644
--- a/addons/knowledge/i18n/es_AR.po
+++ b/addons/knowledge/i18n/es_AR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/es_CR.po b/addons/knowledge/i18n/es_CR.po
index 7d1ffda426b..5f7c0927052 100644
--- a/addons/knowledge/i18n/es_CR.po
+++ b/addons/knowledge/i18n/es_CR.po
@@ -15,8 +15,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 "Language: es\n"
 
 #. module: knowledge
diff --git a/addons/knowledge/i18n/et.po b/addons/knowledge/i18n/et.po
index 3e82de733b4..c3584f1a23c 100644
--- a/addons/knowledge/i18n/et.po
+++ b/addons/knowledge/i18n/et.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/fi.po b/addons/knowledge/i18n/fi.po
index fdbca25d7ca..f5e677461a1 100644
--- a/addons/knowledge/i18n/fi.po
+++ b/addons/knowledge/i18n/fi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/fr.po b/addons/knowledge/i18n/fr.po
index e49e04d6732..b5189ba7117 100644
--- a/addons/knowledge/i18n/fr.po
+++ b/addons/knowledge/i18n/fr.po
@@ -13,8 +13,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/gl.po b/addons/knowledge/i18n/gl.po
index f9a576aa018..dc24ea903f2 100644
--- a/addons/knowledge/i18n/gl.po
+++ b/addons/knowledge/i18n/gl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/hi.po b/addons/knowledge/i18n/hi.po
index c2fcb65ab61..bbb6539b2df 100644
--- a/addons/knowledge/i18n/hi.po
+++ b/addons/knowledge/i18n/hi.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/hr.po b/addons/knowledge/i18n/hr.po
index 7e0e83acb45..1d3474b1dc5 100644
--- a/addons/knowledge/i18n/hr.po
+++ b/addons/knowledge/i18n/hr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/hu.po b/addons/knowledge/i18n/hu.po
index 06ab9866358..8330d694443 100644
--- a/addons/knowledge/i18n/hu.po
+++ b/addons/knowledge/i18n/hu.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/it.po b/addons/knowledge/i18n/it.po
index a257692c9d0..534732a8335 100644
--- a/addons/knowledge/i18n/it.po
+++ b/addons/knowledge/i18n/it.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/ja.po b/addons/knowledge/i18n/ja.po
index 6c387eaf717..4621d95f718 100644
--- a/addons/knowledge/i18n/ja.po
+++ b/addons/knowledge/i18n/ja.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/lo.po b/addons/knowledge/i18n/lo.po
index 8f3f9a2be95..5dabe96bfa5 100644
--- a/addons/knowledge/i18n/lo.po
+++ b/addons/knowledge/i18n/lo.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/lv.po b/addons/knowledge/i18n/lv.po
index af649dd4ac3..1f3f40378e6 100644
--- a/addons/knowledge/i18n/lv.po
+++ b/addons/knowledge/i18n/lv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/mn.po b/addons/knowledge/i18n/mn.po
index 51abd186e70..3c83287a7ea 100644
--- a/addons/knowledge/i18n/mn.po
+++ b/addons/knowledge/i18n/mn.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/nb.po b/addons/knowledge/i18n/nb.po
new file mode 100644
index 00000000000..65487e82e1a
--- /dev/null
+++ b/addons/knowledge/i18n/nb.po
@@ -0,0 +1,33 @@
+# Norwegian Bokmal translation for openobject-addons
+# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2012.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-02-08 01:37+0100\n"
+"PO-Revision-Date: 2012-07-23 10:30+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Norwegian Bokmal <nb@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
+
+#. 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 "Konfigurasjon"
+
+#. module: knowledge
+#: model:ir.ui.menu,name:knowledge.menu_document
+msgid "Knowledge"
+msgstr "Kunnskap"
diff --git a/addons/knowledge/i18n/nl.po b/addons/knowledge/i18n/nl.po
index 1ab0404f632..cc82bb59dba 100644
--- a/addons/knowledge/i18n/nl.po
+++ b/addons/knowledge/i18n/nl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/pl.po b/addons/knowledge/i18n/pl.po
index ae65b22d84e..de89dfffd15 100644
--- a/addons/knowledge/i18n/pl.po
+++ b/addons/knowledge/i18n/pl.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/pt.po b/addons/knowledge/i18n/pt.po
index c02257cc207..4eac22b22db 100644
--- a/addons/knowledge/i18n/pt.po
+++ b/addons/knowledge/i18n/pt.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/pt_BR.po b/addons/knowledge/i18n/pt_BR.po
index 03af0be1cf7..44aa7a9b8c5 100644
--- a/addons/knowledge/i18n/pt_BR.po
+++ b/addons/knowledge/i18n/pt_BR.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/ro.po b/addons/knowledge/i18n/ro.po
index 7753f9dcb47..b386102b4b2 100644
--- a/addons/knowledge/i18n/ro.po
+++ b/addons/knowledge/i18n/ro.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/ru.po b/addons/knowledge/i18n/ru.po
index 01d2675eb25..41e3d0b49d0 100644
--- a/addons/knowledge/i18n/ru.po
+++ b/addons/knowledge/i18n/ru.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/sk.po b/addons/knowledge/i18n/sk.po
index a8a68515361..1e647b2c8a5 100644
--- a/addons/knowledge/i18n/sk.po
+++ b/addons/knowledge/i18n/sk.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/sr.po b/addons/knowledge/i18n/sr.po
index e29d3aa1403..5e02d1d0301 100644
--- a/addons/knowledge/i18n/sr.po
+++ b/addons/knowledge/i18n/sr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/sr@latin.po b/addons/knowledge/i18n/sr@latin.po
index 98f158f321c..78c0ae12f4d 100644
--- a/addons/knowledge/i18n/sr@latin.po
+++ b/addons/knowledge/i18n/sr@latin.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/sv.po b/addons/knowledge/i18n/sv.po
index 4a0ff521857..4783eab3d85 100644
--- a/addons/knowledge/i18n/sv.po
+++ b/addons/knowledge/i18n/sv.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/tr.po b/addons/knowledge/i18n/tr.po
index e4d90ae95b6..f1e1c2c920f 100644
--- a/addons/knowledge/i18n/tr.po
+++ b/addons/knowledge/i18n/tr.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/i18n/zh_CN.po b/addons/knowledge/i18n/zh_CN.po
index b2ae1f70b24..d6703a38dbf 100644
--- a/addons/knowledge/i18n/zh_CN.po
+++ b/addons/knowledge/i18n/zh_CN.po
@@ -14,8 +14,8 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2012-07-14 06:20+0000\n"
-"X-Generator: Launchpad (build 15614)\n"
+"X-Launchpad-Export-Date: 2012-08-07 05:31+0000\n"
+"X-Generator: Launchpad (build 15745)\n"
 
 #. module: knowledge
 #: model:ir.ui.menu,name:knowledge.menu_document2
diff --git a/addons/knowledge/knowledge_view.xml b/addons/knowledge/knowledge_view.xml
index cdc176b347f..9acba0f4b43 100644
--- a/addons/knowledge/knowledge_view.xml
+++ b/addons/knowledge/knowledge_view.xml
@@ -1,13 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
-<data>
-    <menuitem name="Knowledge" icon="terp-stock" id="knowledge.menu_document"
-              sequence="19" groups="base.group_system,base.group_document_user"
-              web_icon="images/knowledge.png"
-              web_icon_hover="images/knowledge-hover.png"/>
-    <menuitem name="Configuration" id="knowledge.menu_document_configuration" parent="knowledge.menu_document" sequence="50"/>
+    <data>
 
-    <menuitem id="knowledge.menu_document2" name="Collaborative Content"
-       parent="knowledge.menu_document" />
+        <!-- Top menu item -->
+        <menuitem name="Knowledge"
+            id="knowledge.menu_document"
+            groups="base.group_system,base.group_document_user"
+            sequence="130"/>
 
-</data>
+        <menuitem name="Configuration" id="knowledge.menu_document_configuration"
+            parent="knowledge.menu_document" sequence="50"/>
+
+        <menuitem name="Collaborative Content" id="knowledge.menu_document2"
+           parent="knowledge.menu_document"/>
+
+    </data>
 </openerp>
diff --git a/addons/knowledge/res_config.py b/addons/knowledge/res_config.py
index 3f9c5b840f7..7d9f161701b 100644
--- a/addons/knowledge/res_config.py
+++ b/addons/knowledge/res_config.py
@@ -25,18 +25,16 @@ class knowledge_config_settings(osv.osv_memory):
     _name = 'knowledge.config.settings'
     _inherit = 'res.config.settings'
     _columns = {
-        'module_wiki_faq': fields.boolean('Internal FAQ as a Wiki',
-            help="""This installs the module wiki_faq."""), 
-        'module_wiki_quality_manual': fields.boolean('Quality Manual as a Wiki',
-            help="""This installs the module wiki_quality_manual."""),
-        'module_document': fields.boolean('Document Management',
+        'module_document_page': fields.boolean('create static web pages',
+            help="""This installs the module document_page."""),
+        'module_document': fields.boolean('manage documents',
             help="""This is a complete document management system, with: user authentication,
                 full document search (but pptx and docx are not supported), and a document dashboard.
                 This installs the module document."""),
-        'module_document_ftp': fields.boolean('Share repositories (FTP)',
+        'module_document_ftp': fields.boolean('share repositories (FTP)',
             help="""Access your documents in OpenERP through an FTP interface.
                 This installs the module document_ftp."""),
-        'module_document_webdav': fields.boolean('Share Repositories (WebDAV)',
+        'module_document_webdav': fields.boolean('share repositories (WebDAV)',
             help="""Access your documents in OpenERP through WebDAV.
                 This installs the module document_webdav."""),
     }
diff --git a/addons/knowledge/res_config_view.xml b/addons/knowledge/res_config_view.xml
index ec4d91683f1..ec7f51af2b4 100644
--- a/addons/knowledge/res_config_view.xml
+++ b/addons/knowledge/res_config_view.xml
@@ -1,32 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
 <openerp>
     <data>
 
         <record id="view_knowledge_configuration" model="ir.ui.view">
             <field name="name">Configure Knowledge</field>
             <field name="model">knowledge.config.settings</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="Configure Knowledge" version="7.0">
+                <form string="Configure Knowledge" class= "oe_form_configuration" version="7.0">
                     <header>
                         <button string="Apply" type="object" name="execute" class="oe_highlight"/>
-                        or 
+                        or
                         <button string="Cancel" type="object" name="cancel" class="oe_link"/>
                     </header>
+                    <separator string="Knowledge and Documents Management"/>
                     <group>
-                        <group string="Wiki">
-                            <field name="module_wiki_faq"/>
-                            <field name="module_wiki_quality_manual"/>
-                        </group>
-                        <group string="Documents">
-                            <field name="module_document"/>
-                            <field name="module_document_ftp"/>
-                            <field name="module_document_webdav"/>
-                        </group>
+                        <label for="id" string="Documents"/>
+                        <div>
+                            <div>
+                                <field name="module_document" class="oe_inline"/>
+                                <label for="module_document"/>
+                            </div>
+                            <div>
+                                <field name="module_document_ftp" class="oe_inline"/>
+                                <label for="module_document_ftp"/>
+                            </div>
+                            <div>
+                                <field name="module_document_webdav" class="oe_inline"/>
+                                <label for="module_document_webdav"/>
+                            </div>
+                            <div>
+                                <field name="module_document_page" class="oe_inline"/>
+                                <label for="module_document_page"/>
+                            </div>
+                        </div>
                     </group>
                 </form>
             </field>
         </record>
-
         <record id="action_knowledge_configuration" model="ir.actions.act_window">
             <field name="name">Configure Knowledge</field>
             <field name="res_model">knowledge.config.settings</field>