[MERGE] trunk

bzr revid: abo@openerp.com-20121127095946-pbbwfd401m2adc3f

2 files changed, 40 insertions, 36 deletions

diff --git a/addons/document/i18n/nb.po b/addons/document/i18n/nb.po
index 7858ff1dde4..4a9ea425402 100644
--- a/addons/document/i18n/nb.po
+++ b/addons/document/i18n/nb.po
@@ -8,14 +8,14 @@ msgstr ""
 "Project-Id-Version: openobject-addons\n"
 "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
 "POT-Creation-Date: 2012-11-24 02:52+0000\n"
-"PO-Revision-Date: 2012-11-20 17:33+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"PO-Revision-Date: 2012-11-26 14:59+0000\n"
+"Last-Translator: Kaare Pettersen <Unknown>\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-11-25 06:17+0000\n"
-"X-Generator: Launchpad (build 16293)\n"
+"X-Launchpad-Export-Date: 2012-11-27 05:24+0000\n"
+"X-Generator: Launchpad (build 16309)\n"
 
 #. module: document
 #: field:document.directory,parent_id:0
@@ -41,7 +41,7 @@ msgstr ""
 #. module: document
 #: sql_constraint:document.directory:0
 msgid "Directory must have a parent or a storage."
-msgstr ""
+msgstr "Katalog må ha en overordnede eller en lagringsplass."
 
 #. module: document
 #: view:document.directory:0
@@ -54,6 +54,8 @@ msgid ""
 "Field to be used as name on resource directories. If empty, the \"name\" "
 "will be used."
 msgstr ""
+"Feltet for å bli brukt som navn på ressurs kataloger. Hvis tomt, vil "
+"\"navn\" benyttes."
 
 #. module: document
 #: view:document.directory:0
@@ -64,7 +66,7 @@ msgstr "Grupper etter ..."
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
 msgid "Directory Content Type"
-msgstr ""
+msgstr "Katalog Innholdstype."
 
 #. module: document
 #: view:document.directory:0
@@ -142,7 +144,7 @@ msgstr "Filtrere på mine dokumenter."
 #: view:ir.attachment:0
 #: field:ir.attachment,index_content:0
 msgid "Indexed Content"
-msgstr ""
+msgstr "Indeksert innhold."
 
 #. module: document
 #: help:document.directory,resource_find_all:0
@@ -150,6 +152,8 @@ msgid ""
 "If true, all attachments that match this resource will  be located. If "
 "false, only ones that have this as parent."
 msgstr ""
+"Hvis sant, vil alle vedlegg som samsvarer denne ressursen bli plassert. Hvis "
+"falsk, eneste som har dette som overordnede."
 
 #. module: document
 #: view:document.directory:0
@@ -273,7 +277,7 @@ msgstr "Innholdstype"
 #. module: document
 #: view:ir.attachment:0
 msgid "Modification"
-msgstr ""
+msgstr "Endring."
 
 #. module: document
 #: view:document.directory:0
@@ -288,7 +292,7 @@ msgstr "Type"
 #: code:addons/document/document_directory.py:234
 #, python-format
 msgid "%s (copy)"
-msgstr ""
+msgstr "%s (kopi)"
 
 #. module: document
 #: help:document.directory,ressource_type_id:0
@@ -306,7 +310,7 @@ msgstr ""
 #. module: document
 #: constraint:document.directory:0
 msgid "Error! You cannot create recursive directories."
-msgstr ""
+msgstr "Feil! Du kan ikke opprette rekursive kataloger."
 
 #. module: document
 #: field:document.directory,resource_field:0
@@ -316,7 +320,7 @@ msgstr "Felt navn."
 #. module: document
 #: field:document.directory,dctx_ids:0
 msgid "Context fields"
-msgstr ""
+msgstr "Kontekst felt."
 
 #. module: document
 #: field:ir.attachment,store_fname:0
@@ -347,13 +351,13 @@ msgstr "Utvidelse"
 #. module: document
 #: field:document.directory,content_ids:0
 msgid "Virtual Files"
-msgstr ""
+msgstr "Virtuelle filer."
 
 #. module: document
 #: code:addons/document/document_storage.py:635
 #, python-format
 msgid "Error at doc write!"
-msgstr ""
+msgstr "Feil på doc skrive!"
 
 #. module: document
 #: view:document.directory:0
@@ -394,12 +398,12 @@ msgstr "Siste endring bruker."
 #: model:ir.actions.act_window,name:document.action_view_files_by_user_graph
 #: view:report.document.user:0
 msgid "Files by User"
-msgstr ""
+msgstr "Filene etter bruker."
 
 #. module: document
 #: view:ir.attachment:0
 msgid "on"
-msgstr ""
+msgstr "på."
 
 #. module: document
 #: field:document.directory,domain:0
@@ -455,11 +459,12 @@ msgstr "Definere ord i sammenheng, for alle underordnede kataloger og filer."
 msgid ""
 "If not checked, media is currently offline and its contents not available"
 msgstr ""
+"Hvis det ikke er merket, er media offline og dens innhold ikke tilgjengelig."
 
 #. module: document
 #: field:report.document.user,user:0
 msgid "unknown"
-msgstr ""
+msgstr "Ukjent."
 
 #. module: document
 #: view:document.directory:0
@@ -505,12 +510,12 @@ msgstr ""
 #: model:ir.actions.act_window,name:document.open_board_document_manager
 #: model:ir.ui.menu,name:document.menu_reports_document
 msgid "Knowledge"
-msgstr ""
+msgstr "Kunnskap."
 
 #. module: document
 #: view:document.storage:0
 msgid "Document Storage"
-msgstr ""
+msgstr "Dokument lager."
 
 #. module: document
 #: view:document.configuration:0
@@ -552,7 +557,7 @@ msgstr ""
 #: code:addons/document/static/src/js/document.js:6
 #, python-format
 msgid "Attachment(s)"
-msgstr ""
+msgstr "Vedlegg(s)"
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -562,7 +567,7 @@ msgstr "August"
 #. module: document
 #: view:ir.attachment:0
 msgid "My Document(s)"
-msgstr ""
+msgstr "Mine dokumenter."
 
 #. module: document
 #: sql_constraint:document.directory:0
@@ -648,7 +653,7 @@ msgstr "Katalogen Navnet må være unikt!"
 #. module: document
 #: view:ir.attachment:0
 msgid "Attachments"
-msgstr ""
+msgstr "Vedlegg."
 
 #. module: document
 #: field:document.directory,create_uid:0
@@ -690,17 +695,17 @@ msgstr "Underordnede"
 #. module: document
 #: view:board.board:0
 msgid "Files by user"
-msgstr ""
+msgstr "Filer av bruker."
 
 #. module: document
 #: selection:document.storage,type:0
 msgid "External file storage"
-msgstr ""
+msgstr "Ekstern fillagring."
 
 #. module: document
 #: help:document.storage,path:0
 msgid "For file storage, the root path of the storage"
-msgstr ""
+msgstr "For fil lagring, rotbanen Av lagring."
 
 #. module: document
 #: field:document.directory.dctx,field:0
@@ -752,7 +757,7 @@ msgstr "ir.vedlegg"
 #. module: document
 #: view:report.document.user:0
 msgid "Users File"
-msgstr ""
+msgstr "Brukerens fil."
 
 #. module: document
 #: view:document.directory:0
@@ -795,7 +800,7 @@ msgstr "Navn"
 #. module: document
 #: sql_constraint:document.storage:0
 msgid "The storage path must be unique!"
-msgstr ""
+msgstr "Lagrings stien må være unik!"
 
 #. module: document
 #: view:document.directory:0
@@ -805,7 +810,7 @@ msgstr "Felter"
 #. module: document
 #: help:document.storage,readonly:0
 msgid "If set, media is for reading only"
-msgstr ""
+msgstr "Hvis innstilt, er media for lesing bare."
 
 #. module: document
 #: selection:report.document.user,month:0
@@ -821,7 +826,7 @@ msgstr "# av filer."
 #. module: document
 #: view:document.storage:0
 msgid "Search Document Storage"
-msgstr ""
+msgstr "Søk dokument lagring."
 
 #. module: document
 #: view:document.directory:0
@@ -837,7 +842,7 @@ msgstr ""
 #: code:addons/document/static/src/js/document.js:17
 #, python-format
 msgid "%s (%s)"
-msgstr ""
+msgstr "%s (%s)"
 
 #. module: document
 #: field:document.directory.content,sequence:0
@@ -847,7 +852,7 @@ msgstr "Sekvens"
 #. module: document
 #: field:document.directory.content,name:0
 msgid "Content Name"
-msgstr ""
+msgstr "Innhold navn."
 
 #. module: document
 #: field:report.document.user,datas_fname:0
@@ -857,7 +862,7 @@ msgstr "Filnavn"
 #. module: document
 #: selection:document.storage,type:0
 msgid "Internal File storage"
-msgstr ""
+msgstr "Intern Fillagring."
 
 #. module: document
 #: view:document.configuration:0
@@ -886,7 +891,7 @@ msgstr "Lagringsmedium"
 #. module: document
 #: field:document.directory.content,extension:0
 msgid "Document Type"
-msgstr ""
+msgstr "Dokumenttype."
 
 #~ msgid "Files per Month"
 #~ msgstr "Filer per måned."
diff --git a/addons/document/wizard/document_configuration_view.xml b/addons/document/wizard/document_configuration_view.xml
index 48b41f94500..ec7b13d123a 100644
--- a/addons/document/wizard/document_configuration_view.xml
+++ b/addons/document/wizard/document_configuration_view.xml
@@ -11,10 +11,9 @@
                 <attribute name="string">Knowledge Application Configuration</attribute>
             </form>
             <group string="res_config_contents" position="replace">
-                <group string="Configure Directories">
-                    <label string="OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed."/>
-                    <label align="0.0" string="When executing this wizard, it will configure your directories automatically according to modules installed."/>
-                </group>
+                <separator string="Configure Directories"/>
+                <p>OpenERP's Document Management System supports mapping virtual folders with documents. The virtual folder of a document can be used to manage the files attached to the document, or to print and download any report. This tool will create directories automatically according to modules installed.</p>
+                <p>When executing this wizard, it will configure your directories automatically according to modules installed.</p>
             </group>
           </data>
         </field>