[evolution-kolab] Updated Slovenian translation

[Matej UrbanÄiÄ <mateju src gnome org>]

commit 9c6000b578e6e3b8344d8ff05328d4f0ff2bc70f
Author: Matej UrbanÄiÄ <mateju svn gnome org>
Date:   Fri Oct 19 23:39:17 2012 +0200

    Updated Slovenian translation

 po/sl.po |   79 ++++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 44 insertions(+), 35 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 49de810..66dd949 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution-kolab master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-kolab&keywords=I18N+L10N&component=build\n";
-"POT-Creation-Date: 2012-10-16 16:44+0000\n"
-"PO-Revision-Date: 2012-10-16 20:13+0100\n"
+"POT-Creation-Date: 2012-10-19 18:27+0000\n"
+"PO-Revision-Date: 2012-10-19 23:35+0100\n"
 "Last-Translator: Matej UrbanÄiÄ <mateju svn gnome org>\n"
 "Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
 "Language: sl\n"
@@ -242,42 +242,51 @@ msgctxt "Sync Conflict Resolution"
 msgid "Remember my choice and do not ask me again for this folder"
 msgstr "Zapomni si izbor in ne vpraÅaj veÄ za to mapo."
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:176
+#: ../src/eplugin/e-kolab-folder-metadata.c:298
 msgctxt "Kolab Folder Metadata"
 msgid "Folder Type (Annotation)"
 msgstr "Vrsta mape (oznaÄevanje)"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:189
+#: ../src/eplugin/e-kolab-folder-metadata.c:311
 msgctxt "Kolab Folder Type"
 msgid "Mail"
 msgstr "PoÅta"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:197
+#: ../src/eplugin/e-kolab-folder-metadata.c:319
 msgctxt "Kolab Folder Type"
 msgid "Calendar"
 msgstr "Koledar"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:204
+#: ../src/eplugin/e-kolab-folder-metadata.c:326
 msgctxt "Kolab Folder Type"
 msgid "Memos"
 msgstr "Opomniki"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:211
+#: ../src/eplugin/e-kolab-folder-metadata.c:333
 msgctxt "Kolab Folder Type"
 msgid "Tasks"
 msgstr "Naloge"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:218
+#: ../src/eplugin/e-kolab-folder-metadata.c:340
 msgctxt "Kolab Folder Type"
 msgid "Contacts"
 msgstr "Stiki"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:227
+#: ../src/eplugin/e-kolab-folder-metadata.c:349
 msgctxt "Kolab Folder Metadata"
 msgid "Kolab Folder Options"
 msgstr "MoÅnosti mape Kolab"
 
-#: ../src/eplugin/e-kolab-folder-metadata.c:238
+#: ../src/eplugin/e-kolab-folder-metadata.c:361
+msgctxt "Sync Conflict Resolution"
+msgid ""
+"Strategy for resolving PIM conflicts when synchronizing\n"
+"with the Kolab server"
+msgstr ""
+"Strategija za razreÅevanje sporov PIM med usklajevanjem\n"
+"s streÅnikom Kolab."
+
+#: ../src/eplugin/e-kolab-folder-metadata.c:378
 msgctxt "Kolab Folder Options"
 msgid "Show all PIM folders in this Kolab account"
 msgstr "PokaÅi vse mape PIM tega raÄuna Kolab"
@@ -333,13 +342,13 @@ msgid "Current Folder Permissions"
 msgstr "Dovoljenja trenutne mape"
 
 #: ../src/eplugin/e-kolab-folder-permissions.c:636
-#: ../src/eplugin/e-kolab-folder-permissions.c:911
+#: ../src/eplugin/e-kolab-folder-permissions.c:912
 msgctxt "Kolab Folder Permissions"
 msgid "(No access rights retrieved from server)"
 msgstr "(s streÅnika ni pridobljenih dovoljenj dostopa)"
 
 #: ../src/eplugin/e-kolab-folder-permissions.c:646
-#: ../src/eplugin/e-kolab-folder-permissions.c:890
+#: ../src/eplugin/e-kolab-folder-permissions.c:891
 msgctxt "Kolab Folder Permissions"
 msgid "IMAP Folder Permissions"
 msgstr "Dovoljenja mape IMAP"
@@ -354,64 +363,64 @@ msgctxt "Kolab Folder Permissions"
 msgid "Permissions"
 msgstr "Dovoljenja"
 
-#: ../src/eplugin/e-kolab-folder-permissions.c:906
+#: ../src/eplugin/e-kolab-folder-permissions.c:907
 msgctxt "Kolab Folder Permissions"
 msgid "My Folder Permissions"
 msgstr "Dovoljenja osebne mape"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:60
-#: ../src/eplugin/e-kolab-plugin-ui.c:69
-#: ../src/eplugin/e-kolab-plugin-ui.c:78
-#: ../src/eplugin/e-kolab-plugin-ui.c:87
-#: ../src/eplugin/e-kolab-plugin-ui.c:96
+#: ../src/eplugin/e-kolab-plugin-ui.c:62
+#: ../src/eplugin/e-kolab-plugin-ui.c:71
+#: ../src/eplugin/e-kolab-plugin-ui.c:80
+#: ../src/eplugin/e-kolab-plugin-ui.c:89
+#: ../src/eplugin/e-kolab-plugin-ui.c:98
 msgid "Kolab Folder Properties..."
 msgstr "Lastnosti mape Kolab ..."
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:62
+#: ../src/eplugin/e-kolab-plugin-ui.c:64
 msgid "Edit Kolab mail folder properties"
 msgstr "Uredi lastnosti poÅtne mape Kolab"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:71
+#: ../src/eplugin/e-kolab-plugin-ui.c:73
 msgid "Edit Kolab calendar folder properties"
 msgstr "Uredi lastnosti mape koledarja Kolab"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:80
+#: ../src/eplugin/e-kolab-plugin-ui.c:82
 msgid "Edit Kolab memos folder properties"
 msgstr "Uredi lastnosti mape opomnikov Kolab"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:89
+#: ../src/eplugin/e-kolab-plugin-ui.c:91
 msgid "Edit Kolab Tasks folder properties"
 msgstr "Uredi lastnosti mape nalog Kolab"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:98
+#: ../src/eplugin/e-kolab-plugin-ui.c:100
 msgid "Edit Kolab contacts folder properties"
 msgstr "Uredi lastnosti mape stikov Kolab"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:322
+#: ../src/eplugin/e-kolab-plugin-ui.c:325
 msgid "Edit Kolab Folder Properties..."
 msgstr "Uredi lastnosti mape Kolab ..."
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:381
+#: ../src/eplugin/e-kolab-plugin-ui.c:429
 msgctxt "Kolab Folder Properties"
 msgid "IMAP Metadata"
 msgstr "Metapodatki IMAP"
 
-#: ../src/eplugin/e-kolab-plugin-ui.c:390
+#: ../src/eplugin/e-kolab-plugin-ui.c:438
 msgctxt "Kolab Folder Properties"
 msgid "IMAP Access Control"
 msgstr "Nadzor dostopa IMAP"
 
-#: ../src/eplugin/e-kolab-plugin-util.c:178
+#: ../src/eplugin/e-kolab-plugin-util.c:202
 msgctxt "Kolab Folder Properties"
 msgid "Selected Resource:"
 msgstr "Izbrani vir:"
 
-#: ../src/eplugin/e-kolab-plugin-util.c:192
+#: ../src/eplugin/e-kolab-plugin-util.c:216
 msgctxt "Kolab Folder Properties"
 msgid "Selected Folder:"
 msgstr "Izbrana mapa:"
 
-#: ../src/eplugin/e-kolab-plugin-util.c:372
+#: ../src/eplugin/e-kolab-plugin-util.c:437
 #, c-format
 msgid "Could not get the Kolab store from shell view!"
 msgstr "Shrambe Kolab ni mogoÄe pridobiti iz lupine!"
@@ -521,28 +530,28 @@ msgstr "Napaka SQLite: veÄ razpredelnic je poimenovanih '%s' v okvarjeni podatk
 msgid "SQLite Error: could not open/create SQLite database '%s'"
 msgstr "Napaka SQLite: podatkovne zbirke '%s' ni mogoÄe odpreti oziroma ustvariti"
 
-#: ../src/libekolab/camel-kolab-imapx-store.c:381
-#: ../src/libekolab/camel-kolab-imapx-store.c:478
+#: ../src/libekolab/camel-kolab-imapx-store.c:375
+#: ../src/libekolab/camel-kolab-imapx-store.c:472
 #, c-format
 msgid "Must be online to complete this operation"
 msgstr "Za dokonÄanje tega opravila je treba biti povezan v omreÅje"
 
-#: ../src/libekolab/camel-kolab-imapx-store.c:390
+#: ../src/libekolab/camel-kolab-imapx-store.c:384
 #, c-format
 msgid "Could not determine server metadata protocol type"
 msgstr "Ni mogoÄe doloÄiti vrste metapodatkovnega protokola streÅnika"
 
-#: ../src/libekolab/camel-kolab-imapx-store.c:846
+#: ../src/libekolab/camel-kolab-imapx-store.c:868
 #, c-format
 msgid "Kolab server %s"
 msgstr "StreÅnik Kolab %s"
 
-#: ../src/libekolab/camel-kolab-imapx-store.c:848
+#: ../src/libekolab/camel-kolab-imapx-store.c:870
 #, c-format
 msgid "Kolab service for %s on %s"
 msgstr "Storitev Kolab za %s na %s"
 
-#: ../src/libekolab/camel-kolab-imapx-store.c:1454
+#: ../src/libekolab/camel-kolab-imapx-store.c:1472
 #, c-format
 msgid "Could not get user cache directory from Camel service"
 msgstr "Iz storitve Camel ni mogoÄe pridobiti mape uporabniÅkega predpomnilnika"