[IMP] English Improvement resolved conflicts

bzr revid: kum@tinyerp.co.in-20091125113147-pmsqovlrx4ia54hf
bzr revid: kum@tinyerp.co.in-20091126062538-149ru08q9obdlksy
bzr revid: kum@tinyerp.co.in-20091126084252-ml6pgh170e6f4r3f

2 files changed, 28 insertions, 28 deletions

diff --git a/addons/document/i18n/sl.po b/addons/document/i18n/sl.po
index a8a3600bb20..47bfd8af594 100644
--- a/addons/document/i18n/sl.po
+++ b/addons/document/i18n/sl.po
@@ -7,13 +7,13 @@ msgstr ""
 "Project-Id-Version: OpenERP Server 5.0.4\n"
 "Report-Msgid-Bugs-To: support@openerp.com\n"
 "POT-Creation-Date: 2009-08-28 16:01+0000\n"
-"PO-Revision-Date: 2009-11-17 07:31+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-23 09:56+0000\n"
+"Last-Translator: Simon Vidmar <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: 2009-11-18 04:43+0000\n"
+"X-Launchpad-Export-Date: 2009-11-24 04:39+0000\n"
 "X-Generator: Launchpad (build Unknown)\n"
 
 #. module: document
@@ -24,12 +24,12 @@ msgstr "Ustvarjeno"
 #. module: document
 #: field:document.directory,ressource_id:0
 msgid "Resource ID"
-msgstr ""
+msgstr "Oznaka vira"
 
 #. module: document
 #: field:document.directory.content,include_name:0
 msgid "Include Record Name"
-msgstr ""
+msgstr "Vključi ime zapisa"
 
 #. module: document
 #: constraint:ir.model:0
@@ -41,7 +41,7 @@ msgstr ""
 #. module: document
 #: field:ir.actions.report.xml,model_id:0
 msgid "Model Id"
-msgstr ""
+msgstr "Oznaka modela"
 
 #. module: document
 #: constraint:document.directory:0
@@ -51,7 +51,7 @@ msgstr "Napaka! Ne morete izdelati rekurzivnih imenikov."
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_configuration
 msgid "Document Configuration"
-msgstr ""
+msgstr "Konfiguracija dokumenta"
 
 #. module: document
 #: view:ir.attachment:0
@@ -66,7 +66,7 @@ msgstr "Način shranjevanja"
 #. module: document
 #: model:ir.actions.act_window,name:document.action_config_auto_directory
 msgid "Auto Configure Directory"
-msgstr ""
+msgstr "Samodejno konfiguriraj imenik"
 
 #. module: document
 #: field:ir.attachment,file_size:0
@@ -83,12 +83,12 @@ msgstr ""
 #. module: document
 #: selection:document.directory,type:0
 msgid "Other Resources"
-msgstr ""
+msgstr "Ostali viri"
 
 #. module: document
 #: field:document.directory,ressource_parent_type_id:0
 msgid "Parent Model"
-msgstr ""
+msgstr "Nadrejeni model"
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -103,7 +103,7 @@ msgstr "Priponka"
 #. module: document
 #: constraint:ir.actions.act_window:0
 msgid "Invalid model name in the action definition."
-msgstr ""
+msgstr "Napačno ime modela v definiciji dejanja."
 
 #. module: document
 #: selection:document.directory,type:0
@@ -113,7 +113,7 @@ msgstr "Statični imenik"
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content_type
 msgid "Directory Content Type"
-msgstr ""
+msgstr "Tip vsebine imenika"
 
 #. module: document
 #: help:document.directory,domain:0
@@ -137,12 +137,12 @@ msgstr "Tip"
 #: model:ir.actions.act_window,name:document.action_document_directory_tree
 #: model:ir.ui.menu,name:document.menu_document_directories_tree
 msgid "Directorie's Structure"
-msgstr ""
+msgstr "Struktura imenikov"
 
 #. module: document
 #: field:document.directory,parent_id:0
 msgid "Parent Item"
-msgstr ""
+msgstr "Nadrejeni element"
 
 #. module: document
 #: view:ir.attachment:0
@@ -158,13 +158,13 @@ msgstr "Datoteke"
 #. module: document
 #: field:ir.attachment,store_fname:0
 msgid "Stored Filename"
-msgstr ""
+msgstr "Ime shranjene datoteke"
 
 #. module: document
 #: field:document.directory,write_uid:0
 #: field:ir.attachment,write_uid:0
 msgid "Last Modification User"
-msgstr ""
+msgstr "Uporabnik, ki je zadnji spreminjal"
 
 #. module: document
 #: view:document.configuration.wizard:0
@@ -179,7 +179,7 @@ msgstr "Drevesna struktura"
 #. module: document
 #: field:ir.attachment,title:0
 msgid "Resource Title"
-msgstr ""
+msgstr "Naslov vira"
 
 #. module: document
 #: model:ir.actions.todo,note:document.config_auto_directory
@@ -191,7 +191,7 @@ msgstr ""
 #. module: document
 #: model:ir.model,name:document.model_document_directory_content
 msgid "Directory Content"
-msgstr ""
+msgstr "Vsebina imenika"
 
 #. module: document
 #: help:document.directory,ressource_parent_type_id:0
@@ -331,7 +331,7 @@ msgstr "document.configuration.wizard"
 #. module: document
 #: view:ir.attachment:0
 msgid "Attached To"
-msgstr ""
+msgstr "Pripet k"
 
 #. module: document
 #: selection:ir.attachment,store_method:0
@@ -343,7 +343,7 @@ msgstr "Datotečni sistem"
 #: field:document.directory.content.type,name:0
 #: field:ir.attachment,file_type:0
 msgid "Content Type"
-msgstr ""
+msgstr "Tip vsebine"
 
 #. module: document
 #: view:document.directory:0
@@ -354,12 +354,12 @@ msgstr "Varnost"
 #. module: document
 #: model:ir.ui.menu,name:document.menu_document_browse
 msgid "Browse Files Using FTP"
-msgstr ""
+msgstr "Razsikuj datoteke s FTP"
 
 #. module: document
 #: field:document.directory,ressource_type_id:0
 msgid "Directories Mapped to Objects"
-msgstr ""
+msgstr "Imeniki povezani na predmete"
 
 #. module: document
 #: view:ir.attachment:0
@@ -376,7 +376,7 @@ msgstr ""
 #. module: document
 #: view:ir.attachment:0
 msgid "Others Info"
-msgstr ""
+msgstr "Druge informacije"
 
 #. module: document
 #: field:document.directory,domain:0
@@ -423,7 +423,7 @@ msgstr "Avtor"
 #. module: document
 #: view:document.directory:0
 msgid "Auto-Generated Files"
-msgstr ""
+msgstr "Samodejno izdelane datoteke"
 
 #. module: document
 #: field:document.directory.content,sequence:0
diff --git a/addons/document/security/document_security.xml b/addons/document/security/document_security.xml
index 4cef19d31ed..52b4e6de990 100644
--- a/addons/document/security/document_security.xml
+++ b/addons/document/security/document_security.xml
@@ -3,12 +3,12 @@
 <data noupdate="0">
 
     <record id="group_document_manager" model="res.groups">
-		<field name="name">Document / Manager</field>
+        <field name="name">Document / Manager</field>
     </record>
 
-	<record id="menu_document_configuration" model="ir.ui.menu">
-		<field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
-	</record>
+    <record id="menu_document_configuration" model="ir.ui.menu">
+        <field name="groups_id" eval="[(6,0,[ref('group_document_manager')])]"/>
+    </record>
 
 </data>
 </openerp>