[MERGE] merged with trunk-development-branch

bzr revid: hmo@tinyerp.com-20111214122924-izzibrz1yz67rt7g

4 files changed, 53 insertions, 53 deletions

diff --git a/addons/wiki/__openerp__.py b/addons/wiki/__openerp__.py
index 1c6aae0baaf..ab9203a9afd 100644
--- a/addons/wiki/__openerp__.py
+++ b/addons/wiki/__openerp__.py
@@ -20,10 +20,10 @@
 ##############################################################################
 
 {
-    'name': 'Collaborative Content (Wiki)',
+    'name': 'Wiki',
     'version': '1.0.1',
     'category': 'Knowledge Management',
-    'complexity': "easy",
+    'complexity': "normal",
     'description': """
 The base module to manage documents(wiki).
 ==========================================
diff --git a/addons/wiki/i18n/hr.po b/addons/wiki/i18n/hr.po
index fe6a66b2a23..15d85738228 100644
--- a/addons/wiki/i18n/hr.po
+++ b/addons/wiki/i18n/hr.po
@@ -7,14 +7,14 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 6.0dev\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2011-01-11 11:16+0000\n"
-"PO-Revision-Date: 2011-09-20 02:17+0000\n"
-"Last-Translator: wooer <Unknown>\n"
+"PO-Revision-Date: 2011-12-08 16:14+0000\n"
+"Last-Translator: Tomislav Bosnjakovic <Unknown>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Launchpad-Export-Date: 2011-11-05 05:35+0000\n"
-"X-Generator: Launchpad (build 14231)\n"
+"X-Launchpad-Export-Date: 2011-12-09 04:46+0000\n"
+"X-Generator: Launchpad (build 14450)\n"
 
 #. module: wiki
 #: field:wiki.groups,template:0
@@ -52,12 +52,12 @@ msgstr "Izbornik"
 #. module: wiki
 #: field:wiki.wiki,section:0
 msgid "Section"
-msgstr "Odlomak"
+msgstr "Grupa"
 
 #. module: wiki
 #: help:wiki.wiki,toc:0
 msgid "Indicates that this pages have a table of contents or not"
-msgstr "Ukazuje da li ove stranice imaju tablicu sadržaja ili ne"
+msgstr "Indicates that this pages have a table of contents or not"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_history
@@ -79,18 +79,18 @@ msgstr "Sadržaj"
 #. module: wiki
 #: field:wiki.wiki,child_ids:0
 msgid "Child Pages"
-msgstr ""
+msgstr "Podređene stranice"
 
 #. module: wiki
 #: field:wiki.wiki,parent_id:0
 msgid "Parent Page"
-msgstr ""
+msgstr "Parent Page"
 
 #. module: wiki
 #: view:wiki.wiki:0
 #: field:wiki.wiki,write_uid:0
 msgid "Last Contributor"
-msgstr "Zadnji suradnik"
+msgstr "Zadnji doprinos"
 
 #. module: wiki
 #: field:wiki.create.menu,menu_parent_id:0
@@ -100,7 +100,7 @@ msgstr "Nadređeni izbornik"
 #. module: wiki
 #: help:wiki.wiki,group_id:0
 msgid "Topic, also called Wiki Group"
-msgstr ""
+msgstr "Topic, poznat kao Wiki Group"
 
 #. module: wiki
 #: field:wiki.groups,name:0
@@ -117,12 +117,12 @@ msgstr "Naslov"
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_create_menu
 msgid "Wizard Create Menu"
-msgstr "Čarobnjak za stvaranje izbornika"
+msgstr "Wizard Create Menu"
 
 #. module: wiki
 #: field:wiki.wiki,history_id:0
 msgid "History Lines"
-msgstr "Redovi povijesti"
+msgstr "Povijesni niz"
 
 #. module: wiki
 #: view:wiki.wiki:0
@@ -159,7 +159,7 @@ msgstr "Opis"
 #. module: wiki
 #: field:wiki.wiki,review:0
 msgid "Needs Review"
-msgstr "Potrebno pregledati"
+msgstr "Traži provjeru"
 
 #. module: wiki
 #: help:wiki.wiki,review:0
@@ -167,7 +167,8 @@ msgid ""
 "Indicates that this page should be reviewed, raising the attention of other "
 "contributors"
 msgstr ""
-"Ukazuje da ovu stranicu treba pregledati, skrećući pozornost drugih suradnika"
+"Indicates that this page should be reviewed, raising the attention of other "
+"contributors"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -183,7 +184,7 @@ msgstr "Povijest stranice"
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "Tree"
-msgstr ""
+msgstr "Stablo"
 
 #. module: wiki
 #: view:wiki.groups:0
@@ -193,7 +194,7 @@ msgstr "Predložak stranice"
 #. module: wiki
 #: field:wiki.wiki,tags:0
 msgid "Keywords"
-msgstr ""
+msgstr "Ključne riječi"
 
 #. module: wiki
 #: model:ir.actions.act_window,help:wiki.action_wiki
@@ -203,6 +204,10 @@ msgid ""
 "(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
 "There is a basic wiki editing for text format."
 msgstr ""
+"With Wiki Pages you can share ideas and questions with your coworkers. You "
+"can create a new document that can be linked to one or several applications "
+"(CRM, Sales, etc.). You can use keywords to ease access to your wiki pages. "
+"There is a basic wiki editing for text format."
 
 #. module: wiki
 #: code:addons/wiki/wizard/wiki_show_diff.py:54
@@ -230,17 +235,17 @@ msgstr "Želite li kreirati indeks na označenim stranicama ? "
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_show_diff_values
 #: view:wizard.wiki.history.show_diff:0
 msgid "Difference"
-msgstr ""
+msgstr "Razlika"
 
 #. module: wiki
 #: field:wiki.groups,page_ids:0
 msgid "Pages"
-msgstr "Stranice"
+msgstr "Pages"
 
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Group Description"
-msgstr ""
+msgstr "Group Description"
 
 #. module: wiki
 #: help:wiki.wiki,section:0
@@ -250,7 +255,7 @@ msgstr "Koristite numeriranje odlomaka na stranici poput 1.2.1"
 #. module: wiki
 #: view:wiki.wiki.page.open:0
 msgid "Want to open a wiki page? "
-msgstr ""
+msgstr "Want to open a wiki page? "
 
 #. module: wiki
 #: field:wiki.groups,section:0
@@ -265,7 +270,7 @@ msgstr "Područje teksta"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Meta Information"
-msgstr ""
+msgstr "Meta informacije"
 
 #. module: wiki
 #: model:ir.module.module,description:wiki.module_meta_information
@@ -286,12 +291,12 @@ msgstr "Bilješke"
 #. module: wiki
 #: help:wiki.groups,home:0
 msgid "Required to select home page if display method is Home Page"
-msgstr ""
+msgstr "Required to select home page if display method is Home Page"
 
 #. module: wiki
 #: selection:wiki.groups,method:0
 msgid "List"
-msgstr ""
+msgstr "List"
 
 #. module: wiki
 #: field:wiki.wiki,summary:0
@@ -317,12 +322,12 @@ msgstr "wiki.wiki"
 #. module: wiki
 #: help:wiki.groups,method:0
 msgid "Define the default behaviour of the menu created on this group"
-msgstr ""
+msgstr "Definirajte uobičajeno ponašanje izbornika za ovu grupu"
 
 #. module: wiki
 #: view:wizard.wiki.history.show_diff:0
 msgid "Close"
-msgstr ""
+msgstr "Zatvori"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wizard_wiki_history_show_diff
@@ -338,17 +343,17 @@ msgstr "Wiki Id"
 #: field:wiki.groups,home:0
 #: selection:wiki.groups,method:0
 msgid "Home Page"
-msgstr ""
+msgstr "Home Page"
 
 #. module: wiki
 #: help:wiki.wiki,parent_id:0
 msgid "Allows you to link with the other page with in the current topic"
-msgstr ""
+msgstr "Allows you to link with the other page with in the current topic"
 
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Modification Information"
-msgstr ""
+msgstr "Informacije o promjeni"
 
 #. module: wiki
 #: model:ir.ui.menu,name:wiki.menu_wiki_configuration
@@ -364,7 +369,7 @@ msgstr "Datum promjene"
 #. module: wiki
 #: view:wiki.groups:0
 msgid "Configuration"
-msgstr "Postavke"
+msgstr "Postava"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_view_wiki_make_index
@@ -383,7 +388,7 @@ msgstr "Potrebno je odabrati najmanje 1 do najviše 2 povijesne revizije!"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Group By..."
-msgstr ""
+msgstr "Grupiraj po..."
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_create_menu
@@ -391,7 +396,7 @@ msgstr ""
 #: view:wiki.groups:0
 #: view:wiki.make.index:0
 msgid "Create Menu"
-msgstr "Kreiraj izbornik"
+msgstr "Stvori izbornik"
 
 #. module: wiki
 #: field:wiki.wiki.history,minor_edit:0
@@ -410,7 +415,7 @@ msgstr "Wiki grupe"
 #. module: wiki
 #: view:wiki.wiki:0
 msgid "Topic"
-msgstr ""
+msgstr "Naslov"
 
 #. module: wiki
 #: field:wiki.wiki.history,write_uid:0
@@ -428,12 +433,12 @@ msgstr "Sadržaj"
 #: view:wiki.groups:0
 #: view:wiki.wiki.page.open:0
 msgid "Open Wiki Page"
-msgstr ""
+msgstr "Open Wiki Page"
 
 #. module: wiki
 #: model:ir.model,name:wiki.model_wiki_wiki_page_open
 msgid "wiz open page"
-msgstr ""
+msgstr "wiz open page"
 
 #. module: wiki
 #: view:wiki.create.menu:0
@@ -455,12 +460,12 @@ msgstr "Potrebna provjera"
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.action_wiki_review
 msgid "Pages Waiting Review"
-msgstr ""
+msgstr "Čekanje pregleda stranice"
 
 #. module: wiki
 #: model:ir.actions.act_window,name:wiki.act_wiki_group_open
 msgid "Search Page"
-msgstr ""
+msgstr "Search Page"
 
 #~ msgid "Child Groups"
 #~ msgstr "Podgrupe"
diff --git a/addons/wiki/security/ir.model.access.csv b/addons/wiki/security/ir.model.access.csv
index 96545498ffc..0cbce7333f3 100644
--- a/addons/wiki/security/ir.model.access.csv
+++ b/addons/wiki/security/ir.model.access.csv
@@ -1,8 +1,8 @@
-"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
-"wiki_wiki_all","wiki.wiki","model_wiki_wiki",,1,0,0,0
-"wiki_groups_all","wiki.groups","model_wiki_groups",,1,0,0,0
-"wiki_wiki","wiki.wiki","model_wiki_wiki","base.group_user",1,1,1,1
-"wiki_groups","wiki.groups","model_wiki_groups","base.group_system",1,1,1,1
-"wiki_wiki_history","wiki.wiki.history","model_wiki_wiki_history","base.group_user",1,0,1,0
-"access_wiki_wiki_sale_manager","wiki.wiki.manager","model_wiki_wiki","base.group_sale_manager",1,1,1,1
-"wiki_wiki_user","wiki.wiki user","model_wiki_wiki","base.group_document_user",1,1,1,1
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink

+wiki_wiki_all,wiki.wiki,model_wiki_wiki,,1,0,0,0

+wiki_groups_all,wiki.groups,model_wiki_groups,,1,0,0,0

+wiki_wiki,wiki.wiki,model_wiki_wiki,base.group_user,1,1,1,1

+wiki_groups,wiki.groups,model_wiki_groups,base.group_system,1,1,1,1

+wiki_wiki_history,wiki.wiki.history,model_wiki_wiki_history,base.group_user,1,0,1,0

+access_wiki_wiki_sale_manager,wiki.wiki.manager,model_wiki_wiki,base.group_sale_manager,1,1,1,1

+wiki_wiki_user,wiki.wiki user,model_wiki_wiki,base.group_document_user,1,1,1,1

diff --git a/addons/wiki/security/wiki_security.xml b/addons/wiki/security/wiki_security.xml
index 98a8c03c177..16bd30c151f 100644
--- a/addons/wiki/security/wiki_security.xml
+++ b/addons/wiki/security/wiki_security.xml
@@ -2,14 +2,9 @@
 <openerp>
 <data noupdate="0">
 
-    <record id="base.group_sale_manager" model="res.groups">
-        <field name="name">Sales / Manager</field>
-    </record>
-    <record id="base.group_sale_salesman" model="res.groups">
-        <field name="name">Sales / User</field>
-    </record>
     <record id="base.group_document_user" model="res.groups">
-        <field name="name">Knowledge / User</field>
+        <field name="name">User</field>
+        <field name="category_id" ref="base.module_category_knowledge_management"/>
     </record>
     
 </data>