[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

1 files changed, 14 insertions, 14 deletions

diff --git a/addons/document_ics/i18n/sl.po b/addons/document_ics/i18n/sl.po
index f144006505e..e55202179ff 100644
--- a/addons/document_ics/i18n/sl.po
+++ b/addons/document_ics/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:29+0000\n"
-"Last-Translator: Fabien (Open ERP) <fp@tinyerp.com>\n"
+"PO-Revision-Date: 2009-11-23 09:59+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_ics
@@ -36,7 +36,7 @@ msgstr "Napaka! Ne morete izdelati rekurzivnih imenikov."
 #. module: document_ics
 #: field:document.ics.crm.wizard,jobs:0
 msgid "Jobs Hiring Process"
-msgstr ""
+msgstr "Proces zaposlovanja"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
@@ -46,12 +46,12 @@ msgstr ""
 #. module: document_ics
 #: field:document.ics.crm.wizard,helpdesk:0
 msgid "Helpdesk"
-msgstr ""
+msgstr "Pomoč uporabnikom"
 
 #. module: document_ics
 #: field:document.directory.ics.fields,field_id:0
 msgid "Open ERP Field"
-msgstr ""
+msgstr "Polje OpenERP"
 
 #. module: document_ics
 #: view:document.ics.crm.wizard:0
@@ -66,7 +66,7 @@ msgstr "Vsebina"
 #. module: document_ics
 #: field:document.ics.crm.wizard,meeting:0
 msgid "Calendar of Meetings"
-msgstr ""
+msgstr "Koledar sestankov"
 
 #. module: document_ics
 #: model:crm.case.section,name:document_ics.section_meeting
@@ -81,12 +81,12 @@ msgstr "url"
 #. module: document_ics
 #: 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_ics
 #: help:document.ics.crm.wizard,bugs:0
 msgid "Used by companies to track bugs and support requests on softwares"
-msgstr ""
+msgstr "Uporabljajo programerska podjetja za sledenje napakam in zahtevkom"
 
 #. module: document_ics
 #: model:ir.actions.todo,note:document_ics.config_wizard_step_case_section_menu
@@ -131,7 +131,7 @@ msgstr ""
 #. module: document_ics
 #: help:document.ics.crm.wizard,helpdesk:0
 msgid "Manages an Helpdesk service."
-msgstr ""
+msgstr "Upravlja s storitvijo pomoči uporabnikom"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,fund:0
@@ -220,17 +220,17 @@ msgstr ""
 #. module: document_ics
 #: view:crm.case:0
 msgid "Duration(In Hour)"
-msgstr ""
+msgstr "Trajanje (v urah)"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,document_ics:0
 msgid "Shared Calendar"
-msgstr ""
+msgstr "Deljeni koledar"
 
 #. module: document_ics
 #: field:document.ics.crm.wizard,claims:0
 msgid "Claims"
-msgstr ""
+msgstr "Zahtevki"
 
 #. module: document_ics
 #: help:document.ics.crm.wizard,phonecall:0
@@ -252,7 +252,7 @@ msgstr "Telefonski klici"
 #. module: document_ics
 #: field:document.ics.crm.wizard,bugs:0
 msgid "Bug Tracking"
-msgstr ""
+msgstr "Sledenje napakam"
 
 #. module: document_ics
 #: selection:document.directory.ics.fields,name:0