[evolution-data-server] Updated Slovenian translation

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

commit 4f02d7a96cbda4835f7fd9d7417540f47e6f2e9c
Author: Matej UrbanÄ?iÄ? <mateju svn gnome org>
Date:   Fri Nov 6 15:07:36 2009 +0100

    Updated Slovenian translation

 po/sl.po | 1345 ++++++++++++++++++++++++++++++++------------------------------
 1 files changed, 686 insertions(+), 659 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 8f674ee..b69f51f 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,15 +7,17 @@ msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=evolution-data-server&component=general\n";
-"POT-Creation-Date: 2009-09-11 10:58+0000\n"
-"PO-Revision-Date: 2009-09-12 09:40+0100\n"
+"POT-Creation-Date: 2009-11-06 04:57+0000\n"
+"PO-Revision-Date: 2009-11-06 07:56+0100\n"
 "Last-Translator: Matej UrbanÄ?iÄ? <mateju svn gnome org>\n"
-"Language-Team: Slovenian <sl li org>\n"
+"Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Poedit-Country: SLOVENIA\n"
 "X-Poedit-Language: Slovenian\n"
+"X-Poedit-SourceCharset: utf-8\n"
 
 #: ../addressbook/backends/file/e-book-backend-file.c:560
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2330
@@ -27,16 +29,16 @@ msgstr "Nalaganje ..."
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2261
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2283
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2328
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4510
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4508
 #: ../addressbook/backends/vcf/e-book-backend-vcf.c:476
 msgid "Searching..."
 msgstr "Iskanje ..."
 
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2696
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4674
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4672
 #, c-format
 msgid "Downloading contacts (%d)... "
-msgstr "Prenašanje stikov (%d) ..."
+msgstr "Prejemanje stikov (%d) ..."
 
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:2845
 #: ../addressbook/backends/groupwise/e-book-backend-groupwise.c:3029
@@ -45,44 +47,44 @@ msgstr "Prenašanje stikov (%d) ..."
 msgid "Updating contacts cache (%d)... "
 msgstr "Posodabljanje predpomnilnika stikov (%d) ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:788
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:786
 msgid "Using Distinguished Name (DN)"
 msgstr "Z uporabo razloÄ?nega imena (DN)"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:791
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:789
 msgid "Using Email Address"
 msgstr "Z uporabo elektronskega naslova"
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1067
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1065
 msgid "Reconnecting to LDAP server..."
 msgstr "Ponovno povezovanje s strežnikom LDAP ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1711
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1709
 msgid "Adding contact to LDAP server..."
 msgstr "Dodajanje stika na strežnik LDAP ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1845
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:1843
 msgid "Removing contact from LDAP server..."
 msgstr "Odstranjujem stik iz strežnika LDAP ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2282
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:2280
 msgid "Modifying contact from LDAP server..."
 msgstr "Spreminjam stik na strežniku LDAP ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4371
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4369
 msgid "Receiving LDAP search results..."
 msgstr "Dobivam rezultate iskanja LDAP ..."
 
-#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4532
+#: ../addressbook/backends/ldap/e-book-backend-ldap.c:4530
 msgid "Error performing search"
 msgstr "Napaka ob iskanju"
 
-#: ../addressbook/libebook/e-book.c:1837
+#: ../addressbook/libebook/e-book.c:1835
 #, c-format
 msgid "%s: there was no self contact UID stored in gconf"
 msgstr "%s: v gconf ni bilo shranjenega UID lastnega stika"
 
-#: ../addressbook/libebook/e-book.c:1967
+#: ../addressbook/libebook/e-book.c:1965
 #, c-format
 msgid "%s: there was no source for uid `%s' stored in gconf."
 msgstr "%s: v gconf ni shranjenega vira za UID '%s'."
@@ -256,7 +258,7 @@ msgstr "Vloga"
 
 #: ../addressbook/libebook/e-contact.c:168
 msgid "Manager"
-msgstr "Upravljalec"
+msgstr "Upravljalnik"
 
 #: ../addressbook/libebook/e-contact.c:169
 msgid "Assistant"
@@ -538,7 +540,7 @@ msgid "Birth Date"
 msgstr "Rojstni datum"
 
 #: ../addressbook/libebook/e-contact.c:260
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:647
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:713
 #: ../libedataserver/e-categories.c:45
 msgid "Anniversary"
 msgstr "Obletnica"
@@ -622,17 +624,78 @@ msgstr "SIP naslov"
 msgid "Unnamed List"
 msgstr "Neimenovan seznam"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:649
+#: ../addressbook/libedata-book/e-data-book-factory.c:292
+#, c-format
+msgid "Empty URI"
+msgstr "Neveljaven URI"
+
+#: ../addressbook/libedata-book/e-data-book-factory.c:307
+#: ../addressbook/libedata-book/e-data-book-factory.c:332
+#: ../calendar/libedata-cal/e-data-cal-factory.c:323
+#: ../calendar/libedata-cal/e-data-cal-factory.c:332
+#, c-format
+msgid "Invalid source"
+msgstr "Neveljaven vir"
+
+#: ../addressbook/libedata-book/e-data-book.c:301
+msgid "Cannot open book"
+msgstr "Ni mogoÄ?e odpreti knjige"
+
+#: ../addressbook/libedata-book/e-data-book.c:319
+msgid "Cannot remove book"
+msgstr "Ni mogoÄ?e odstraniti knjige"
+
+#: ../addressbook/libedata-book/e-data-book.c:331
+#: ../addressbook/libedata-book/e-data-book.c:346
+msgid "Cannot get contact"
+msgstr "Ni mogoÄ?e pridobiti stika"
+
+#: ../addressbook/libedata-book/e-data-book.c:358
+msgid "Empty query"
+msgstr "PoÄ?isti poizvedbo"
+
+#: ../addressbook/libedata-book/e-data-book.c:402
+msgid "Cannot authenticate user"
+msgstr "Ni mogoÄ?e overiti uporabnika"
+
+#: ../addressbook/libedata-book/e-data-book.c:414
+#: ../addressbook/libedata-book/e-data-book.c:429
+msgid "Cannot add contact"
+msgstr "Ni mogoÄ?e dodati stika"
+
+#: ../addressbook/libedata-book/e-data-book.c:444
+#: ../addressbook/libedata-book/e-data-book.c:459
+msgid "Cannot modify contact"
+msgstr "Ni mogoÄ?e spreminjati stika"
+
+#: ../addressbook/libedata-book/e-data-book.c:494
+msgid "Cannot remove contacts"
+msgstr "Ni mogoÄ?e odstraniti stika"
+
+#: ../addressbook/libedata-book/e-data-book.c:569
+#: ../calendar/libedata-cal/e-cal-backend-util.c:139
+msgid "Invalid query"
+msgstr "Neveljavna poizvedba"
+
+#: ../addressbook/libedata-book/e-data-book.c:598
+msgid "Cannot get changes"
+msgstr "Ni mogoÄ?e dobiti sprememb"
+
+#: ../addressbook/libedata-book/e-data-book.c:699
+msgid "Cannot complete operation"
+msgstr "Ni mogoÄ?e zakljuÄ?iti dejanja"
+
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:715
 #: ../libedataserver/e-categories.c:46
 msgid "Birthday"
 msgstr "Rojstni dan"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:678
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:744
 #, c-format
 msgid "Birthday: %s"
 msgstr "Rojstni dan: %s"
 
-#: ../calendar/backends/contacts/e-cal-backend-contacts.c:702
+#: ../calendar/backends/contacts/e-cal-backend-contacts.c:768
 #, c-format
 msgid "Anniversary: %s"
 msgstr "Obletnica: %s"
@@ -646,11 +709,11 @@ msgstr "Ni mogoÄ?e shraniti podatkov koledarja: Nepravilen URI."
 msgid "Cannot save calendar data"
 msgstr "Ni mogoÄ?e shraniti podatkov koledarja"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:344
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:342
 msgid "Could not create thread for getting deltas"
 msgstr "Ni mogoÄ?e ustvariti niti za pridobivanje delt"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:376
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:374
 #: ../calendar/backends/google/e-cal-backend-google.c:1189
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1080
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1381
@@ -659,7 +722,7 @@ msgstr "Ni mogoÄ?e ustvariti niti za pridobivanje delt"
 msgid "Could not create cache file"
 msgstr "Ni mogoÄ?e ustvariti datoteke s predpomnilnikom"
 
-#: ../calendar/backends/google/e-cal-backend-google-utils.c:389
+#: ../calendar/backends/google/e-cal-backend-google-utils.c:387
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1093
 msgid "Could not create thread for populating cache"
 msgstr "Ni mogoÄ?e ustvariti niti za naselitev predpomnilnika"
@@ -680,7 +743,6 @@ msgid "Loading %s items"
 msgstr "Nalaganje %s predmetov"
 
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:918
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:260
 msgid "Calendar"
 msgstr "Koledar"
 
@@ -691,7 +753,7 @@ msgstr "Neveljaven URI strežnika"
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:995
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1004
 #: ../calendar/backends/groupwise/e-cal-backend-groupwise.c:1098
-#: ../calendar/libecal/e-cal.c:5117
+#: ../calendar/libecal/e-cal.c:3750
 #: ../calendar/libedata-cal/e-cal-backend-util.c:117
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1291
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1327
@@ -759,131 +821,131 @@ msgstr "Vreme: nevihtno"
 msgid "Forecast"
 msgstr "Napoved"
 
-#: ../calendar/libecal/e-cal-component.c:1320
+#: ../calendar/libecal/e-cal-component.c:1316
 msgid "Untitled appointment"
 msgstr "Neimenovan sestanek"
 
-#: ../calendar/libecal/e-cal-recur.c:3945
+#: ../calendar/libecal/e-cal-recur.c:3951
 msgid "1st"
 msgstr "1."
 
-#: ../calendar/libecal/e-cal-recur.c:3946
+#: ../calendar/libecal/e-cal-recur.c:3952
 msgid "2nd"
 msgstr "2."
 
-#: ../calendar/libecal/e-cal-recur.c:3947
+#: ../calendar/libecal/e-cal-recur.c:3953
 msgid "3rd"
 msgstr "3."
 
-#: ../calendar/libecal/e-cal-recur.c:3948
+#: ../calendar/libecal/e-cal-recur.c:3954
 msgid "4th"
 msgstr "4."
 
-#: ../calendar/libecal/e-cal-recur.c:3949
+#: ../calendar/libecal/e-cal-recur.c:3955
 msgid "5th"
 msgstr "5."
 
-#: ../calendar/libecal/e-cal-recur.c:3950
+#: ../calendar/libecal/e-cal-recur.c:3956
 msgid "6th"
 msgstr "6."
 
-#: ../calendar/libecal/e-cal-recur.c:3951
+#: ../calendar/libecal/e-cal-recur.c:3957
 msgid "7th"
 msgstr "7."
 
-#: ../calendar/libecal/e-cal-recur.c:3952
+#: ../calendar/libecal/e-cal-recur.c:3958
 msgid "8th"
 msgstr "8."
 
-#: ../calendar/libecal/e-cal-recur.c:3953
+#: ../calendar/libecal/e-cal-recur.c:3959
 msgid "9th"
 msgstr "9."
 
-#: ../calendar/libecal/e-cal-recur.c:3954
+#: ../calendar/libecal/e-cal-recur.c:3960
 msgid "10th"
 msgstr "10."
 
-#: ../calendar/libecal/e-cal-recur.c:3955
+#: ../calendar/libecal/e-cal-recur.c:3961
 msgid "11th"
 msgstr "11."
 
-#: ../calendar/libecal/e-cal-recur.c:3956
+#: ../calendar/libecal/e-cal-recur.c:3962
 msgid "12th"
 msgstr "12."
 
-#: ../calendar/libecal/e-cal-recur.c:3957
+#: ../calendar/libecal/e-cal-recur.c:3963
 msgid "13th"
 msgstr "13."
 
-#: ../calendar/libecal/e-cal-recur.c:3958
+#: ../calendar/libecal/e-cal-recur.c:3964
 msgid "14th"
 msgstr "14."
 
-#: ../calendar/libecal/e-cal-recur.c:3959
+#: ../calendar/libecal/e-cal-recur.c:3965
 msgid "15th"
 msgstr "15."
 
-#: ../calendar/libecal/e-cal-recur.c:3960
+#: ../calendar/libecal/e-cal-recur.c:3966
 msgid "16th"
 msgstr "16."
 
-#: ../calendar/libecal/e-cal-recur.c:3961
+#: ../calendar/libecal/e-cal-recur.c:3967
 msgid "17th"
 msgstr "17."
 
-#: ../calendar/libecal/e-cal-recur.c:3962
+#: ../calendar/libecal/e-cal-recur.c:3968
 msgid "18th"
 msgstr "18."
 
-#: ../calendar/libecal/e-cal-recur.c:3963
+#: ../calendar/libecal/e-cal-recur.c:3969
 msgid "19th"
 msgstr "19."
 
-#: ../calendar/libecal/e-cal-recur.c:3964
+#: ../calendar/libecal/e-cal-recur.c:3970
 msgid "20th"
 msgstr "20."
 
-#: ../calendar/libecal/e-cal-recur.c:3965
+#: ../calendar/libecal/e-cal-recur.c:3971
 msgid "21st"
 msgstr "21."
 
-#: ../calendar/libecal/e-cal-recur.c:3966
+#: ../calendar/libecal/e-cal-recur.c:3972
 msgid "22nd"
 msgstr "22."
 
-#: ../calendar/libecal/e-cal-recur.c:3967
+#: ../calendar/libecal/e-cal-recur.c:3973
 msgid "23rd"
 msgstr "23."
 
-#: ../calendar/libecal/e-cal-recur.c:3968
+#: ../calendar/libecal/e-cal-recur.c:3974
 msgid "24th"
 msgstr "24."
 
-#: ../calendar/libecal/e-cal-recur.c:3969
+#: ../calendar/libecal/e-cal-recur.c:3975
 msgid "25th"
 msgstr "25."
 
-#: ../calendar/libecal/e-cal-recur.c:3970
+#: ../calendar/libecal/e-cal-recur.c:3976
 msgid "26th"
 msgstr "26."
 
-#: ../calendar/libecal/e-cal-recur.c:3971
+#: ../calendar/libecal/e-cal-recur.c:3977
 msgid "27th"
 msgstr "27."
 
-#: ../calendar/libecal/e-cal-recur.c:3972
+#: ../calendar/libecal/e-cal-recur.c:3978
 msgid "28th"
 msgstr "28."
 
-#: ../calendar/libecal/e-cal-recur.c:3973
+#: ../calendar/libecal/e-cal-recur.c:3979
 msgid "29th"
 msgstr "29."
 
-#: ../calendar/libecal/e-cal-recur.c:3974
+#: ../calendar/libecal/e-cal-recur.c:3980
 msgid "30th"
 msgstr "30."
 
-#: ../calendar/libecal/e-cal-recur.c:3975
+#: ../calendar/libecal/e-cal-recur.c:3981
 msgid "31st"
 msgstr "31."
 
@@ -907,7 +969,7 @@ msgstr "nizka"
 msgid "Undefined"
 msgstr "ni definirana"
 
-#: ../calendar/libecal/e-cal.c:1693
+#: ../calendar/libecal/e-cal.c:1065
 #: ../libedataserverui/e-book-auth-util.c:199
 #, c-format
 msgid "Enter password for %s (user %s)"
@@ -917,94 +979,93 @@ msgstr "Vnesite geslo za %s (uporabnik %s)"
 #. This password prompt will be prompted rarely. Since the key that is passed to
 #. the auth_func corresponds to the parent user.
 #.
-#: ../calendar/libecal/e-cal.c:1707
+#: ../calendar/libecal/e-cal.c:1079
 #, c-format
 msgid "Enter password for %s to enable proxy for user %s"
 msgstr "Vnesite geslo za %s za vklop strežnika proxy za uporabnika %s"
 
-#: ../calendar/libecal/e-cal.c:5089
+#: ../calendar/libecal/e-cal.c:3722
 msgid "Invalid argument"
 msgstr "Neveljaven argument"
 
-#: ../calendar/libecal/e-cal.c:5091
+#: ../calendar/libecal/e-cal.c:3724
 msgid "Backend is busy"
 msgstr "Hrbtni del zaseden"
 
-#: ../calendar/libecal/e-cal.c:5093
+#: ../calendar/libecal/e-cal.c:3726
 #: ../calendar/libedata-cal/e-cal-backend-util.c:105
 msgid "Repository is offline"
 msgstr "SkladiÅ¡Ä?e ni na zvezi"
 
-#: ../calendar/libecal/e-cal.c:5095
+#: ../calendar/libecal/e-cal.c:3728
 #: ../calendar/libedata-cal/e-cal-backend-util.c:129
 msgid "No such calendar"
 msgstr "Ni takega koledarja"
 
-#: ../calendar/libecal/e-cal.c:5097
+#: ../calendar/libecal/e-cal.c:3730
 #: ../calendar/libedata-cal/e-cal-backend-util.c:111
 #: ../servers/groupwise/e-gw-connection.c:233
 msgid "Object not found"
 msgstr "Predmeta ni mogoÄ?e najti"
 
-#: ../calendar/libecal/e-cal.c:5099
+#: ../calendar/libecal/e-cal.c:3732
 #: ../calendar/libedata-cal/e-cal-backend-util.c:113
 #: ../servers/groupwise/e-gw-connection.c:227
 msgid "Invalid object"
 msgstr "Neveljaven predmet"
 
-#: ../calendar/libecal/e-cal.c:5101
+#: ../calendar/libecal/e-cal.c:3734
 msgid "URI not loaded"
 msgstr "URI ni naložen"
 
-#: ../calendar/libecal/e-cal.c:5103
+#: ../calendar/libecal/e-cal.c:3736
 msgid "URI already loaded"
 msgstr "URI je že naložen"
 
-#: ../calendar/libecal/e-cal.c:5105
+#: ../calendar/libecal/e-cal.c:3738
 #: ../calendar/libedata-cal/e-cal-backend-util.c:107
-#: ../servers/exchange/storage/e-storage.c:573
 msgid "Permission denied"
 msgstr "Nimate dovoljenja"
 
-#: ../calendar/libecal/e-cal.c:5107
+#: ../calendar/libecal/e-cal.c:3740
 #: ../calendar/libedata-cal/e-cal-backend-util.c:131
 #: ../servers/groupwise/e-gw-connection.c:235
 msgid "Unknown User"
 msgstr "Neznan uporabnik"
 
-#: ../calendar/libecal/e-cal.c:5109
+#: ../calendar/libecal/e-cal.c:3742
 #: ../calendar/libedata-cal/e-cal-backend-util.c:115
 msgid "Object ID already exists"
 msgstr "Predmet ID že obstaja"
 
-#: ../calendar/libecal/e-cal.c:5111
+#: ../calendar/libecal/e-cal.c:3744
 msgid "Protocol not supported"
 msgstr "Protokol ni podprt"
 
-#: ../calendar/libecal/e-cal.c:5113
+#: ../calendar/libecal/e-cal.c:3746
 msgid "Operation has been canceled"
-msgstr "Operacija je bila preklicana"
+msgstr "Opravilo je bila preklicano"
 
-#: ../calendar/libecal/e-cal.c:5115
+#: ../calendar/libecal/e-cal.c:3748
 #: ../calendar/libedata-cal/e-cal-backend-util.c:143
 msgid "Could not cancel operation"
 msgstr "Ni mogoÄ?e preklicati dejanja"
 
-#: ../calendar/libecal/e-cal.c:5119
+#: ../calendar/libecal/e-cal.c:3752
 #: ../calendar/libedata-cal/e-cal-backend-util.c:119
 #: ../camel/providers/smtp/camel-smtp-transport.c:217
 msgid "Authentication required"
 msgstr "Zahtevana je overitev"
 
-#: ../calendar/libecal/e-cal.c:5121
+#: ../calendar/libecal/e-cal.c:3754
 msgid "A CORBA exception has occurred"
 msgstr "Prišlo je do izjeme CORBA"
 
-#: ../calendar/libecal/e-cal.c:5123
+#: ../calendar/libecal/e-cal.c:3756
 #: ../calendar/libedata-cal/e-cal-backend-util.c:146
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:214
 #: ../camel/providers/imap/camel-imap-command.c:432
-#: ../camel/providers/imap/camel-imap-store.c:743
+#: ../camel/providers/imap/camel-imap-store.c:741
 #: ../camel/providers/imap4/camel-imap4-engine.c:1547
 #: ../camel/providers/imap4/camel-imap4-engine.c:1585
 #: ../camel/providers/imap4/camel-imap4-engine.c:1629
@@ -1015,14 +1076,12 @@ msgstr "Prišlo je do izjeme CORBA"
 #: ../camel/providers/pop3/camel-pop3-store.c:552
 #: ../camel/providers/pop3/camel-pop3-store.c:559
 #: ../camel/providers/pop3/camel-pop3-store.c:565
-#: ../servers/exchange/storage/e-storage.c:587
 #: ../servers/groupwise/e-gw-connection.c:241
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: ../calendar/libecal/e-cal.c:5125
+#: ../calendar/libecal/e-cal.c:3758
 #: ../calendar/libedata-cal/e-cal-backend-util.c:103
-#: ../servers/exchange/storage/e-storage.c:555
 msgid "No error"
 msgstr "Brez napak"
 
@@ -1099,7 +1158,7 @@ msgstr "\"%s\" priÄ?akuje, da je drugi argument niz"
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:773
 #, c-format
 msgid "\"%s\" expects the first argument to be either \"any\", \"summary\", or \"description\", or \"location\", or \"attendee\", or \"organizer\", or \"classification\""
-msgstr "\"%s\" priÄ?akuje, da je prvi argument \"karkoli\", \"povzetek\", \"opis\", \"lokacija\", \"prisotni\", \"organizator\" ali \"klasifikacija\""
+msgstr "\"%s\" priÄ?akuje, da je prvi argument \"karkoli\", \"povzetek\", \"opis\", \"mesto\", \"navzoÄ?i\", \"organizator\" ali \"klasifikacija\""
 
 #: ../calendar/libedata-cal/e-cal-backend-sexp.c:925
 #, c-format
@@ -1143,10 +1202,6 @@ msgstr "Presežena je omejitev velikosti iskanja"
 msgid "Search time limit exceeded"
 msgstr "Presežena je omejitev Ä?asa iskanja"
 
-#: ../calendar/libedata-cal/e-cal-backend-util.c:139
-msgid "Invalid query"
-msgstr "Neveljavna poizvedba"
-
 #: ../calendar/libedata-cal/e-cal-backend-util.c:141
 msgid "Query refused"
 msgstr "Poizvedba zavrnjena"
@@ -1155,6 +1210,131 @@ msgstr "Poizvedba zavrnjena"
 msgid "Invalid server version"
 msgstr "Neveljavna razliÄ?ica strežnika"
 
+#: ../calendar/libedata-cal/e-data-cal.c:483
+#, c-format
+msgid "Cannot retrieve calendar address"
+msgstr "Ni mogoÄ?e pridobiti naslova koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:501
+#, c-format
+msgid "Cannot retrieve calendar alarm e-mail address"
+msgstr "Ni mogoÄ?e pridobiti elentronskega naslova alarma koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:519
+#, c-format
+msgid "Cannot retrieve calendar's ldap attribute"
+msgstr "Ni mogoÄ?e pridobiti LDAP atributa koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:537
+#, c-format
+msgid "Cannot retrieve calendar scheduling information"
+msgstr "Ni mogoÄ?e pridobiti podrobnosti urnikov koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:554
+#, c-format
+msgid "Cannot open calendar"
+msgstr "Ni mogoÄ?e odpreti koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:571
+#, c-format
+msgid "Cannot remove calendar"
+msgstr "Ni mogoÄ?e odstraniti koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:590
+#, c-format
+msgid "Cannot create calendar object"
+msgstr "Ni mogoÄ?e ustvariti predmeta koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:612
+#, c-format
+msgid "Cannot modify calender object"
+msgstr "Ni mogoÄ?e spreminjati predmeta koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:636
+#, c-format
+msgid "Cannot remove calendar object"
+msgstr "Ni mogoÄ?e odstraniti predmeta koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:655
+#, c-format
+msgid "Cannot receive calendar objects"
+msgstr "Ni mogoÄ?e prejeti predmeta koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:672
+#, c-format
+msgid "Cannot discard calendar alarm"
+msgstr "Ni mogoÄ?e zavreÄ?i alarma koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:691
+#, c-format
+msgid "Cannot send calendar objects"
+msgstr "Ni mogoÄ?e poÅ¡iljati predmetov koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:726
+#, c-format
+msgid "Cannot retrieve default calendar object path"
+msgstr "Ni mogoÄ?e pridobiti privzete poti predmeta koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:744
+#, c-format
+msgid "Cannot retrieve calendar object path"
+msgstr "Ni mogoÄ?e pridobiti poti predmeta koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:762
+#, c-format
+msgid "Cannot retrieve calendar object list"
+msgstr "Ni mogoÄ?e pridobiti seznama predmeta koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:800
+#, c-format
+msgid "Could not retrieve attachment list"
+msgstr "Ni mogoÄ?e pridobiti seznama prilog"
+
+#: ../calendar/libedata-cal/e-data-cal.c:822
+#, c-format
+msgid "Could not complete calendar query"
+msgstr "Ni mogoÄ?e zakljuÄ?iti poizvedbe koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:840
+#, c-format
+msgid "Could not retrieve calendar time zone"
+msgstr "Ni mogoÄ?e pridobiti Ä?asovnega obmoÄ?ja koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:858
+#, c-format
+msgid "Could not add calendar time zone"
+msgstr "Ni mogoÄ?e dodati Ä?asovnega obmoÄ?ja koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:875
+#, c-format
+msgid "Could not set default calendar time zone"
+msgstr "Ni mogoÄ?e nastaviti privzetega Ä?asovnega obmoÄ?ja koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:896
+#, c-format
+msgid "Cannot retrieve calendar changes"
+msgstr "Ni mogoÄ?e pridobiti sprememb koledarja"
+
+#: ../calendar/libedata-cal/e-data-cal.c:946
+#, c-format
+msgid "Cannot retrieve calendar free/busy list"
+msgstr "Ni mogoÄ?e pridobiti seznama koledarja prosti/zasedeni"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:339
+#, c-format
+msgid "Invalid URI"
+msgstr "Neveljaven URI"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:350
+#, c-format
+msgid "No backend factory for '%s' of '%s'"
+msgstr "Ni tovarne hrbtiÅ¡Ä?a za '%s' od '%s'"
+
+#: ../calendar/libedata-cal/e-data-cal-factory.c:390
+#, c-format
+msgid "Could not instantiate backend"
+msgstr "Ni mogoÄ?e zaÄ?eti hrbtenice"
+
 #: ../camel/camel-cipher-context.c:102
 msgid "Signing is not supported by this cipher"
 msgstr "Podpisovanje v tem kodirniku ni podprto"
@@ -1204,9 +1384,9 @@ msgstr "Ni mogoÄ?e ustvariti poti predpomnilnika"
 msgid "Could not remove cache entry: %s: %s"
 msgstr "Ni mogoÄ?e odstraniti vnosa v predpomnilniÅ¡k: %s: %s"
 
-#: ../camel/camel-db.c:412
+#: ../camel/camel-db.c:411
 msgid "Insufficient memory"
-msgstr "Nezadostana koliÄ?ina spomina"
+msgstr "Nezadostana koliÄ?ina pomnilnika"
 
 #: ../camel/camel-disco-diary.c:197
 #, c-format
@@ -1216,8 +1396,8 @@ msgid ""
 "reconnect to the network."
 msgstr ""
 "Ni mogoÄ?e zapisati dnevniÅ¡kega zapisa: %s\n"
-"Nadaljnje operacije na tem strežniku ne bodo pomnjene, ko se boste\n"
-"znova povezali v mrežo."
+"Nadaljnja opravila na tem strežniku ne bodo pomnjena, ko se boste\n"
+"znova povezali v omrežje."
 
 #: ../camel/camel-disco-diary.c:260
 #: ../camel/providers/imap/camel-imap-journal.c:320
@@ -1238,7 +1418,7 @@ msgstr "Sinhronizacija s strežnikom"
 #: ../camel/camel-disco-folder.c:43
 #: ../camel/camel-offline-folder.c:51
 msgid "Copy folder content locally for offline operation"
-msgstr "Kopiraj vsebino mape lokalno za delo brez povezave"
+msgstr "Kopiraj vsebino mape krajevno za delo brez povezave"
 
 #: ../camel/camel-disco-folder.c:105
 #: ../camel/camel-offline-folder.c:107
@@ -1252,12 +1432,12 @@ msgstr "Pripravljanje mape '%s' na stanje brez povezave"
 
 #: ../camel/camel-disco-store.c:400
 #: ../camel/providers/groupwise/camel-groupwise-store.c:223
-#: ../camel/providers/imap/camel-imap-store.c:1003
-#: ../camel/providers/imap/camel-imap-store.c:1813
-#: ../camel/providers/imap/camel-imap-store.c:2229
-#: ../camel/providers/imap/camel-imap-store.c:3014
+#: ../camel/providers/imap/camel-imap-store.c:1001
+#: ../camel/providers/imap/camel-imap-store.c:1843
+#: ../camel/providers/imap/camel-imap-store.c:2259
+#: ../camel/providers/imap/camel-imap-store.c:3051
 msgid "You must be working online to complete this operation"
-msgstr "Za dokonÄ?anje te operacije morate delati z mrežo"
+msgstr "Za dokonÄ?anje tega opravila morate morate biti povezani v omrežje"
 
 #: ../camel/camel-exception.c:260
 msgid "No description available"
@@ -1402,47 +1582,48 @@ msgstr "(%s) kot rezultat priÄ?akuje polje"
 msgid "(%s) requires the folder set"
 msgstr "(%s) zahteva seznam map"
 
-#: ../camel/camel-folder.c:683
+#: ../camel/camel-folder.c:669
 #, c-format
 msgid "Unsupported operation: append message: for %s"
 msgstr "Nepodprto dejanje: dodaj sporoÄ?ilo: za %s"
 
-#: ../camel/camel-folder.c:1388
+#: ../camel/camel-folder.c:1374
 #, c-format
 msgid "Unsupported operation: search by expression: for %s"
 msgstr "Nepodprto dejanje: iskanje z izrazom: za %s"
 
-#: ../camel/camel-folder.c:1429
+#: ../camel/camel-folder.c:1415
 #, c-format
 msgid "Unsupported operation: count by expression: for %s"
 msgstr "Nepodprto dejanje: Å¡tetje z izrazom: za %s"
 
-#: ../camel/camel-folder.c:1468
+#: ../camel/camel-folder.c:1454
 #, c-format
 msgid "Unsupported operation: search by UIDs: for %s"
-msgstr "Nepodprta operacija: iskanje po UID: za %s"
+msgstr "Nepodprto opravilo: iskanje po UID: za %s"
 
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1567
+#: ../camel/providers/local/camel-maildir-folder.c:387
 msgid "Moving messages"
 msgstr "Prestavljanje sporoÄ?il"
 
-#: ../camel/camel-folder.c:1581
+#: ../camel/camel-folder.c:1567
 msgid "Copying messages"
 msgstr "Kopiranje sporoÄ?il"
 
-#: ../camel/camel-folder.c:1922
+#: ../camel/camel-folder.c:1908
 msgid "Learning junk"
 msgstr "Spoznavanje neželene pošte"
 
-#: ../camel/camel-folder.c:1939
+#: ../camel/camel-folder.c:1925
 msgid "Learning non-junk"
 msgstr "Spoznavanje pošte, ki ni neželena"
 
-#: ../camel/camel-folder.c:1958
+#: ../camel/camel-folder.c:1944
 msgid "Filtering new message(s)"
 msgstr "Filtriranje novih sporoÄ?il"
 
-#: ../camel/camel-gpg-context.c:751
+#: ../camel/camel-gpg-context.c:752
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -1453,16 +1634,16 @@ msgstr ""
 "\n"
 "%s"
 
-#: ../camel/camel-gpg-context.c:766
+#: ../camel/camel-gpg-context.c:767
 msgid "Failed to parse gpg userid hint."
 msgstr "RazÄ?lenjevanje nasveta za userid gpg ni uspelo."
 
-#: ../camel/camel-gpg-context.c:790
-#: ../camel/camel-gpg-context.c:804
+#: ../camel/camel-gpg-context.c:791
+#: ../camel/camel-gpg-context.c:805
 msgid "Failed to parse gpg passphrase request."
 msgstr "RazÄ?lenjevanje zahteve za geslo gpg ni uspelo."
 
-#: ../camel/camel-gpg-context.c:824
+#: ../camel/camel-gpg-context.c:825
 #, c-format
 msgid ""
 "You need a PIN to unlock the key for your\n"
@@ -1471,7 +1652,7 @@ msgstr ""
 "You need a PIN to unlock the key for your\n"
 "SmartCard: \"%s\""
 
-#: ../camel/camel-gpg-context.c:828
+#: ../camel/camel-gpg-context.c:829
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -1480,107 +1661,106 @@ msgstr ""
 "Za odklepanje kljuÄ?a uporabnika potrebujete\n"
 "geslo: \"%s\""
 
-#: ../camel/camel-gpg-context.c:833
+#: ../camel/camel-gpg-context.c:834
 #, c-format
 msgid "Unexpected request from GnuPG for '%s'"
 msgstr "NepriÄ?akovana zahteva GnuPG za '%s'"
 
-#: ../camel/camel-gpg-context.c:858
-#: ../camel/camel-gpg-context.c:1067
+#: ../camel/camel-gpg-context.c:859
+#: ../camel/camel-gpg-context.c:1068
 #: ../camel/providers/nntp/camel-nntp-store.c:1313
 msgid "Canceled."
 msgstr "Preklicano."
 
-#: ../camel/camel-gpg-context.c:872
+#: ../camel/camel-gpg-context.c:873
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Odklepanje tajnega kljuÄ?a ni uspelo: trije napaÄ?ni vnosi gesla."
 
-#: ../camel/camel-gpg-context.c:880
+#: ../camel/camel-gpg-context.c:881
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "NepriÄ?akovan odgovor od GnuPG: %s"
 
-#: ../camel/camel-gpg-context.c:943
+#: ../camel/camel-gpg-context.c:944
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Å iriranje ni uspelo: ni navedenih veljavnih naslovnikov."
 
 #. always called on an i/o error
-#: ../camel/camel-gpg-context.c:1212
-#: ../camel/camel-gpg-context.c:1337
-#: ../camel/camel-gpg-context.c:1859
-#: ../camel/camel-gpg-context.c:1904
+#: ../camel/camel-gpg-context.c:1214
+#: ../camel/camel-gpg-context.c:1339
+#: ../camel/camel-gpg-context.c:1874
+#: ../camel/camel-gpg-context.c:1919
 #, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Izvajanje gpg ni uspelo: %s"
 
-#: ../camel/camel-gpg-context.c:1305
-#: ../camel/camel-smime-context.c:602
+#: ../camel/camel-gpg-context.c:1307
+#: ../camel/camel-smime-context.c:605
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Ni mogoÄ?e generirati podatkov za podpis: %s"
 
-#: ../camel/camel-gpg-context.c:1352
-#: ../camel/camel-gpg-context.c:1553
-#: ../camel/camel-gpg-context.c:1569
-#: ../camel/camel-gpg-context.c:1649
-#: ../camel/camel-gpg-context.c:1664
-#: ../camel/camel-gpg-context.c:1780
-#: ../camel/camel-gpg-context.c:1795
-#: ../camel/camel-gpg-context.c:1875
-#: ../camel/camel-gpg-context.c:1920
+#: ../camel/camel-gpg-context.c:1354
+#: ../camel/camel-gpg-context.c:1555
+#: ../camel/camel-gpg-context.c:1571
+#: ../camel/camel-gpg-context.c:1651
+#: ../camel/camel-gpg-context.c:1666
+#: ../camel/camel-gpg-context.c:1782
+#: ../camel/camel-gpg-context.c:1797
+#: ../camel/camel-gpg-context.c:1890
+#: ../camel/camel-gpg-context.c:1935
 msgid "Failed to execute gpg."
 msgstr "Izvajanje gpg ni uspelo."
 
-#: ../camel/camel-gpg-context.c:1371
+#: ../camel/camel-gpg-context.c:1373
 msgid "This is a digitally signed message part"
 msgstr "To je digitalno podpisan del sporoÄ?ila"
 
-#: ../camel/camel-gpg-context.c:1457
-#: ../camel/camel-gpg-context.c:1463
-#: ../camel/camel-gpg-context.c:1469
-#: ../camel/camel-gpg-context.c:1484
-#: ../camel/camel-smime-context.c:910
-#: ../camel/camel-smime-context.c:921
-#: ../camel/camel-smime-context.c:928
+#: ../camel/camel-gpg-context.c:1459
+#: ../camel/camel-gpg-context.c:1465
+#: ../camel/camel-gpg-context.c:1471
+#: ../camel/camel-gpg-context.c:1486
+#: ../camel/camel-smime-context.c:929
+#: ../camel/camel-smime-context.c:940
+#: ../camel/camel-smime-context.c:947
 msgid "Cannot verify message signature: Incorrect message format"
 msgstr "Ni mogoÄ?e preveriti podpisa sporoÄ?ila: neveljavna oblika sporoÄ?ila"
 
-#: ../camel/camel-gpg-context.c:1523
+#: ../camel/camel-gpg-context.c:1525
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Ni mogoÄ?e preveriti podpisa sporoÄ?ila: ni mogoÄ?e ustvariti zaÄ?asne datoteke: %s"
 
-#: ../camel/camel-gpg-context.c:1632
+#: ../camel/camel-gpg-context.c:1634
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ni mogoÄ?e generirati podatkov za Å¡ifriranje: %s"
 
-#: ../camel/camel-gpg-context.c:1682
+#: ../camel/camel-gpg-context.c:1684
 msgid "This is a digitally encrypted message part"
 msgstr "To je digitalno podpisan del sporoÄ?ila"
 
-#: ../camel/camel-gpg-context.c:1735
-#: ../camel/camel-gpg-context.c:1743
-#: ../camel/camel-gpg-context.c:1762
+#: ../camel/camel-gpg-context.c:1737
+#: ../camel/camel-gpg-context.c:1745
+#: ../camel/camel-gpg-context.c:1764
 msgid "Cannot decrypt message: Incorrect message format"
 msgstr "Ni mogoÄ?e deÅ¡ifrirati sporoÄ?ila: neveljavna oblika sporoÄ?ila"
 
-#: ../camel/camel-gpg-context.c:1752
+#: ../camel/camel-gpg-context.c:1754
 msgid "Failed to decrypt MIME part: protocol error"
 msgstr "Dešifriranje dela MIME ni uspelo: napaka protokola"
 
-#: ../camel/camel-gpg-context.c:1817
-#: ../camel/camel-smime-context.c:1186
+#: ../camel/camel-gpg-context.c:1832
+#: ../camel/camel-smime-context.c:1205
 msgid "Encrypted content"
 msgstr "Å ifrirana vsebina"
 
-#: ../camel/camel-gpg-context.c:1836
+#: ../camel/camel-gpg-context.c:1851
 msgid "Unable to parse message content"
 msgstr "Ni mogoÄ?e razÄ?leniti vsebine sporoÄ?ila"
 
-#: ../camel/camel-gpg-context.c:1860
-#: ../camel/camel-gpg-context.c:1905
-#: ../camel/camel-tcp-stream-openssl.c:627
+#: ../camel/camel-gpg-context.c:1875
+#: ../camel/camel-gpg-context.c:1920
 #: ../camel/providers/imap4/camel-imap4-utils.c:614
 #: ../camel/providers/smtp/camel-smtp-transport.c:165
 #: ../camel/providers/smtp/camel-smtp-transport.c:220
@@ -1685,7 +1865,7 @@ msgstr "Napaka ob kopiranju zaÄ?asne poÅ¡tne datoteke: %s"
 
 #: ../camel/camel-multipart-signed.c:592
 msgid "parse error"
-msgstr "napaka pri razÄ?lenjevanju"
+msgstr "napaka med razÄ?lenjevanjem"
 
 #: ../camel/camel-net-utils.c:503
 #: ../camel/camel-net-utils.c:674
@@ -1898,8 +2078,7 @@ msgstr "Sklicevane poverilnice so potekle."
 #: ../camel/camel-sasl-gssapi.c:248
 #: ../camel/camel-sasl-gssapi.c:284
 #: ../camel/camel-sasl-gssapi.c:299
-#: ../camel/camel-sasl-kerberos4.c:230
-#: ../camel/providers/imap/camel-imap-store.c:1274
+#: ../camel/providers/imap/camel-imap-store.c:1272
 msgid "Bad authentication response from server."
 msgstr "Strežnik ni odobril overitve."
 
@@ -1907,23 +2086,6 @@ msgstr "Strežnik ni odobril overitve."
 msgid "Unsupported security layer."
 msgstr "Nepodprt varnostni sloj."
 
-#: ../camel/camel-sasl-kerberos4.c:47
-msgid "Kerberos 4"
-msgstr "Kerberos 4"
-
-#: ../camel/camel-sasl-kerberos4.c:49
-msgid "This option will connect to the server using Kerberos 4 authentication."
-msgstr "Ta možnost bo vzpostavila povezavo s strežnikom z uporabo overitve Kerberos 4."
-
-#: ../camel/camel-sasl-kerberos4.c:173
-#, c-format
-msgid ""
-"Could not get Kerberos ticket:\n"
-"%s"
-msgstr ""
-"Ni mogoÄ?e dobiti Kerberos vstopnice:\n"
-"%s"
-
 #: ../camel/camel-sasl-login.c:36
 msgid "Login"
 msgstr "Prijava"
@@ -1972,7 +2134,7 @@ msgstr "Overitev POP pred SMTP z uporabo ne-pop vira"
 #: ../camel/camel-search-private.c:149
 #, c-format
 msgid "Regular expression compilation failed: %s: %s"
-msgstr "Prevajanje regularnega izraza ni uspelo: %s: %s"
+msgstr "Prevajanje logiÄ?nega izraza ni uspelo: %s: %s"
 
 #: ../camel/camel-service.c:265
 #, c-format
@@ -2001,214 +2163,214 @@ msgstr ""
 #: ../camel/camel-session.c:479
 #, c-format
 msgid "Please enter the %s password for %s on host %s."
-msgstr "Prosim, vnesite %s geslo za %s na gostitelju %s"
+msgstr "Vnesite %s geslo za %s na gostitelju %s"
 
 #: ../camel/camel-session.c:817
 msgid "Camel session doesn't support forwarding of a message."
 msgstr "Seja ne podpira posredovanja sporoÄ?il."
 
-#: ../camel/camel-smime-context.c:444
-#: ../camel/camel-smime-context.c:993
+#: ../camel/camel-smime-context.c:447
+#: ../camel/camel-smime-context.c:1012
 #, c-format
 msgid "Cannot find certificate for '%s'"
 msgstr "Ni mogoÄ?e najti potrdila za '%s'"
 
-#: ../camel/camel-smime-context.c:450
+#: ../camel/camel-smime-context.c:453
 msgid "Cannot create CMS message"
 msgstr "Ni mogoÄ?e ustvariti sporoÄ?ila CMS"
 
-#: ../camel/camel-smime-context.c:455
+#: ../camel/camel-smime-context.c:458
 msgid "Cannot create CMS signed data"
 msgstr "Ni mogoÄ?e ustvariti podpisanih podatkov CMS"
 
-#: ../camel/camel-smime-context.c:461
+#: ../camel/camel-smime-context.c:464
 msgid "Cannot attach CMS signed data"
 msgstr "Ni mogoÄ?e pripeti podpisanih podatkov CMS"
 
-#: ../camel/camel-smime-context.c:468
+#: ../camel/camel-smime-context.c:471
 msgid "Cannot attach CMS data"
 msgstr "Ni mogoÄ?e pripeti podatkov CMS"
 
-#: ../camel/camel-smime-context.c:474
+#: ../camel/camel-smime-context.c:477
 msgid "Cannot create CMS Signer information"
 msgstr "Ni mogoÄ?e ustvariti podatkov o podpisniku CMS"
 
-#: ../camel/camel-smime-context.c:480
+#: ../camel/camel-smime-context.c:483
 msgid "Cannot find certificate chain"
 msgstr "Ni mogoÄ?e najti verige potrdil"
 
-#: ../camel/camel-smime-context.c:486
+#: ../camel/camel-smime-context.c:489
 msgid "Cannot add CMS Signing time"
 msgstr "Ni mogoÄ?e dodati Ä?asa podpisa CMS"
 
-#: ../camel/camel-smime-context.c:508
-#: ../camel/camel-smime-context.c:520
+#: ../camel/camel-smime-context.c:511
+#: ../camel/camel-smime-context.c:523
 #, c-format
 msgid "Encryption certificate for '%s' does not exist"
 msgstr "Å ifrirno potrdilo za '%s' ne obstaja"
 
-#: ../camel/camel-smime-context.c:527
+#: ../camel/camel-smime-context.c:530
 msgid "Cannot add SMIMEEncKeyPrefs attribute"
 msgstr "Ni mogoÄ?e dodati atributa SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:532
+#: ../camel/camel-smime-context.c:535
 msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Ni mogoÄ?e dodati atributa MS SMIMEEncKeyPrefs"
 
-#: ../camel/camel-smime-context.c:537
+#: ../camel/camel-smime-context.c:540
 msgid "Cannot add encryption certificate"
 msgstr "Ni mogoÄ?e dodati Å¡ifrirnega potrdila"
 
-#: ../camel/camel-smime-context.c:543
+#: ../camel/camel-smime-context.c:546
 msgid "Cannot add CMS Signer information"
 msgstr "Ni mogoÄ?e dodati podatkov o podpisniku CMS"
 
-#: ../camel/camel-smime-context.c:613
-#: ../camel/camel-smime-context.c:1065
+#: ../camel/camel-smime-context.c:616
+#: ../camel/camel-smime-context.c:1084
 msgid "Cannot create encoder context"
 msgstr "Ni mogoÄ?e ustvariti konteksta Å¡ifrirnika"
 
-#: ../camel/camel-smime-context.c:619
+#: ../camel/camel-smime-context.c:622
 msgid "Failed to add data to CMS encoder"
 msgstr "Dodajenje podatkov Å¡ifrirniku CMS ni uspelo"
 
-#: ../camel/camel-smime-context.c:624
-#: ../camel/camel-smime-context.c:1082
+#: ../camel/camel-smime-context.c:627
+#: ../camel/camel-smime-context.c:1101
 msgid "Failed to encode data"
 msgstr "Å ifriranje podatkov ni uspelo"
 
-#: ../camel/camel-smime-context.c:697
+#: ../camel/camel-smime-context.c:700
 msgid "Unverified"
 msgstr "Nepreverjeno"
 
-#: ../camel/camel-smime-context.c:699
+#: ../camel/camel-smime-context.c:702
 msgid "Good signature"
 msgstr "Dobronameren podpis"
 
-#: ../camel/camel-smime-context.c:701
+#: ../camel/camel-smime-context.c:704
 msgid "Bad signature"
 msgstr "Zlonameren podpis"
 
-#: ../camel/camel-smime-context.c:703
+#: ../camel/camel-smime-context.c:706
 msgid "Content tampered with or altered in transit"
 msgstr "Vsebina je bila med potjo spremenjena ali skušana"
 
-#: ../camel/camel-smime-context.c:705
+#: ../camel/camel-smime-context.c:708
 msgid "Signing certificate not found"
 msgstr "Potrdila za podpisovanje ni mogoÄ?e najti"
 
-#: ../camel/camel-smime-context.c:707
+#: ../camel/camel-smime-context.c:710
 msgid "Signing certificate not trusted"
 msgstr "Potrdilu za podpisovanje ni mogoÄ?e zaupati"
 
-#: ../camel/camel-smime-context.c:709
+#: ../camel/camel-smime-context.c:712
 msgid "Signature algorithm unknown"
 msgstr "Neznan algoritem podpisa"
 
-#: ../camel/camel-smime-context.c:711
+#: ../camel/camel-smime-context.c:714
 msgid "Signature algorithm unsupported"
 msgstr "Nepodprt algoritem podpisa"
 
-#: ../camel/camel-smime-context.c:713
+#: ../camel/camel-smime-context.c:716
 msgid "Malformed signature"
 msgstr "Nepravilen podpis"
 
-#: ../camel/camel-smime-context.c:715
+#: ../camel/camel-smime-context.c:718
 msgid "Processing error"
-msgstr "Napaka pri obdelavi"
+msgstr "Napaka med obdelavo"
 
-#: ../camel/camel-smime-context.c:753
+#: ../camel/camel-smime-context.c:772
 msgid "No signed data in signature"
 msgstr "V podpisu ni podpisanih podatkov"
 
-#: ../camel/camel-smime-context.c:758
+#: ../camel/camel-smime-context.c:777
 msgid "Digests missing from enveloped data"
 msgstr "V ovitih podatkih manjka izvleÄ?ek"
 
-#: ../camel/camel-smime-context.c:771
-#: ../camel/camel-smime-context.c:781
+#: ../camel/camel-smime-context.c:790
+#: ../camel/camel-smime-context.c:800
 msgid "Cannot calculate digests"
 msgstr "Ni mogoÄ?e izraÄ?unati izvleÄ?kov"
 
-#: ../camel/camel-smime-context.c:788
-#: ../camel/camel-smime-context.c:792
+#: ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:811
 msgid "Cannot set message digests"
 msgstr "Ni mogoÄ?e doloÄ?iti izvleÄ?kov sporoÄ?il"
 
-#: ../camel/camel-smime-context.c:802
-#: ../camel/camel-smime-context.c:807
+#: ../camel/camel-smime-context.c:821
+#: ../camel/camel-smime-context.c:826
 msgid "Certificate import failed"
 msgstr "Uvoz potrdila ni uspel"
 
-#: ../camel/camel-smime-context.c:817
+#: ../camel/camel-smime-context.c:836
 #, c-format
 msgid "Certificate is the only message, cannot verify certificates"
 msgstr "Potrdilo je edino sporoÄ?ilo, ki pa ga ni mogoÄ?e preveriti."
 
-#: ../camel/camel-smime-context.c:820
+#: ../camel/camel-smime-context.c:839
 #, c-format
 msgid "Certificate is the only message, certificates imported and verified"
 msgstr "Potrdilo je edino sporoÄ?ilo, je uvoženo in preverjeno."
 
-#: ../camel/camel-smime-context.c:824
+#: ../camel/camel-smime-context.c:843
 msgid "Cannot find signature digests"
 msgstr "IzvleÄ?kov sporoÄ?il ni mogoÄ?e najti"
 
-#: ../camel/camel-smime-context.c:840
+#: ../camel/camel-smime-context.c:859
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Podpisnik: %s <%s>: %s\n"
 
-#: ../camel/camel-smime-context.c:941
-#: ../camel/camel-smime-context.c:1165
+#: ../camel/camel-smime-context.c:960
+#: ../camel/camel-smime-context.c:1184
 msgid "Decoder failed"
 msgstr "Dešifrirniku ni uspelo"
 
-#: ../camel/camel-smime-context.c:1000
+#: ../camel/camel-smime-context.c:1019
 msgid "Cannot find common bulk encryption algorithm"
 msgstr "Ni mogoÄ?e najti sploÅ¡nega algoritma za Å¡ifriranje neželene poÅ¡te"
 
-#: ../camel/camel-smime-context.c:1008
+#: ../camel/camel-smime-context.c:1027
 msgid "Cannot allocate slot for encryption bulk key"
 msgstr "Ni mogoÄ?e najti reže za Å¡ifrirni kljuÄ? neželene poÅ¡te"
 
-#: ../camel/camel-smime-context.c:1019
+#: ../camel/camel-smime-context.c:1038
 msgid "Cannot create CMS Message"
 msgstr "Ni mogoÄ?e ustvariti sporoÄ?ila CMS"
 
-#: ../camel/camel-smime-context.c:1025
+#: ../camel/camel-smime-context.c:1044
 msgid "Cannot create CMS Enveloped data"
 msgstr "Ni mogoÄ?e ustvariti podatkov, zavitih v CMS"
 
-#: ../camel/camel-smime-context.c:1031
+#: ../camel/camel-smime-context.c:1050
 msgid "Cannot attach CMS Enveloped data"
 msgstr "Ni mogoÄ?e pripeti podatkov, zavitih v CMS"
 
-#: ../camel/camel-smime-context.c:1037
+#: ../camel/camel-smime-context.c:1056
 msgid "Cannot attach CMS data object"
 msgstr "Ni mogoÄ?e pripeti podatkovnega predmeta CMS"
 
-#: ../camel/camel-smime-context.c:1046
+#: ../camel/camel-smime-context.c:1065
 msgid "Cannot create CMS Recipient information"
 msgstr "Ni mogoÄ?e ustvariti podatkov prejemnika za CMS"
 
-#: ../camel/camel-smime-context.c:1051
+#: ../camel/camel-smime-context.c:1070
 msgid "Cannot add CMS Recipient information"
 msgstr "Ni mogoÄ?e dodati podatkov prejemnika za CMS"
 
-#: ../camel/camel-smime-context.c:1076
+#: ../camel/camel-smime-context.c:1095
 msgid "Failed to add data to encoder"
 msgstr "Dodajanje podatkov Å¡ifrirniku ni uspelo"
 
-#: ../camel/camel-smime-context.c:1172
+#: ../camel/camel-smime-context.c:1191
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "DeÅ¡ifriranje S/MIME: Å ifrirane vsebine ni mogoÄ?e najti"
 
-#: ../camel/camel-smime-context.c:1200
+#: ../camel/camel-smime-context.c:1219
 msgid "import keys: unimplemented"
 msgstr "kljuÄ?i za uvoz: ni implementirano"
 
-#: ../camel/camel-smime-context.c:1208
+#: ../camel/camel-smime-context.c:1227
 msgid "export keys: unimplemented"
 msgstr "kluÄ?i za izvoz: ni implementirano"
 
@@ -2257,124 +2419,7 @@ msgstr "Smeti"
 msgid "Junk"
 msgstr "Neželena pošta"
 
-#: ../camel/camel-tcp-stream-openssl.c:564
-msgid "Unable to get issuer's certificate"
-msgstr "Ni mogoÄ?e dobiti izdajateljevega potrdila."
-
-#: ../camel/camel-tcp-stream-openssl.c:566
-msgid "Unable to get Certificate Revocation List"
-msgstr "Ni mogoÄ?e dobiti seznama preklica potrdil"
-
-#: ../camel/camel-tcp-stream-openssl.c:568
-msgid "Unable to decrypt certificate signature"
-msgstr "Ni mogoÄ?e deÅ¡ifrirati podpisa potrdila"
-
-#: ../camel/camel-tcp-stream-openssl.c:570
-msgid "Unable to decrypt Certificate Revocation List signature"
-msgstr "Ni mogoÄ?e deÅ¡ifrirati podpisa seznama preklica potrdil"
-
-#: ../camel/camel-tcp-stream-openssl.c:572
-msgid "Unable to decode issuer's public key"
-msgstr "Ni mogoÄ?e deÅ¡ifrirati javnega kljuÄ?a izdajatelja"
-
-#: ../camel/camel-tcp-stream-openssl.c:574
-msgid "Certificate signature failure"
-msgstr "Napaka podpisa potrdila"
-
-#: ../camel/camel-tcp-stream-openssl.c:576
-msgid "Certificate Revocation List signature failure"
-msgstr "Napaka v podpisu seznama preklica potrdil"
-
-#: ../camel/camel-tcp-stream-openssl.c:578
-msgid "Certificate not yet valid"
-msgstr "Potrdilo Å¡e ni veljavno"
-
-#: ../camel/camel-tcp-stream-openssl.c:580
-msgid "Certificate has expired"
-msgstr "Potrdilo je preteklo"
-
-#: ../camel/camel-tcp-stream-openssl.c:582
-msgid "Certificate Revocation List (CRL) not yet valid"
-msgstr "Seznam preklicev (CRL) Å¡e ni overjen"
-
-#: ../camel/camel-tcp-stream-openssl.c:584
-msgid "Certificate Revocation List (CRL) has expired"
-msgstr "Seznam preklica (CRL) je potekel"
-
-#: ../camel/camel-tcp-stream-openssl.c:589
-msgid "Error in Certificate Revocation List (CRL)"
-msgstr "Napaka na seznamu preklica potrdil (CRL)"
-
-#: ../camel/camel-tcp-stream-openssl.c:591
-msgid "Out of memory"
-msgstr "Zmanjkalo je pomnilnika"
-
-#: ../camel/camel-tcp-stream-openssl.c:593
-msgid "Zero-depth self-signed certificate"
-msgstr "Samopodpisano potrdilo niÄ?te globine"
-
-#: ../camel/camel-tcp-stream-openssl.c:595
-msgid "Self-signed certificate in chain"
-msgstr "Samopodpisano potrdilo v verigi"
-
-#: ../camel/camel-tcp-stream-openssl.c:597
-msgid "Unable to get issuer's certificate locally"
-msgstr "Ni mogoÄ?e krajevno dobiti izdajateljevega potrdila"
-
-#: ../camel/camel-tcp-stream-openssl.c:599
-msgid "Unable to verify leaf signature"
-msgstr "Ni mogoÄ?e preveriti podpisa lista"
-
-#: ../camel/camel-tcp-stream-openssl.c:601
-msgid "Certificate chain too long"
-msgstr "Veriga potrdil je predolga"
-
-#: ../camel/camel-tcp-stream-openssl.c:603
-msgid "Certificate Revoked"
-msgstr "Potrdilo je preklicano"
-
-#: ../camel/camel-tcp-stream-openssl.c:605
-msgid "Invalid Certificate Authority (CA)"
-msgstr "Neveljavni izdajatelj potrdil (CA)"
-
-#: ../camel/camel-tcp-stream-openssl.c:607
-msgid "Path length exceeded"
-msgstr "Dolžina poti presežena"
-
-#: ../camel/camel-tcp-stream-openssl.c:609
-msgid "Invalid purpose"
-msgstr "Neveljaven namen"
-
-#: ../camel/camel-tcp-stream-openssl.c:611
-msgid "Certificate untrusted"
-msgstr "Potrdilu ni mogoÄ?e zaupati"
-
-#: ../camel/camel-tcp-stream-openssl.c:613
-msgid "Certificate rejected"
-msgstr "Potrdilo je zavrnjeno"
-
-#: ../camel/camel-tcp-stream-openssl.c:616
-msgid "Subject/Issuer mismatch"
-msgstr "Neujemanje zadeve in izdajatelja"
-
-#: ../camel/camel-tcp-stream-openssl.c:618
-msgid "AKID/SKID mismatch"
-msgstr "Neujemanje AKID/SKID"
-
-#: ../camel/camel-tcp-stream-openssl.c:620
-msgid "AKID/Issuer serial mismatch"
-msgstr "Neujemanje AKID/zaporedna Å¡tevilka izdajatelja"
-
-#: ../camel/camel-tcp-stream-openssl.c:622
-msgid "Key usage does not support certificate signing"
-msgstr "Uporaba kljuÄ?a ne podpira podpisovanja potrdil"
-
-#: ../camel/camel-tcp-stream-openssl.c:625
-msgid "Error in application verification"
-msgstr "Napaka pri preverjanju programa"
-
-#: ../camel/camel-tcp-stream-openssl.c:692
-#: ../camel/camel-tcp-stream-ssl.c:873
+#: ../camel/camel-tcp-stream-ssl.c:870
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -2387,37 +2432,16 @@ msgstr ""
 "Prstni odtis:      %s\n"
 "Podpis:            %s"
 
-#: ../camel/camel-tcp-stream-openssl.c:698
-#: ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
 msgid "GOOD"
 msgstr "V REDU"
 
-#: ../camel/camel-tcp-stream-openssl.c:698
-#: ../camel/camel-tcp-stream-ssl.c:879
+#: ../camel/camel-tcp-stream-ssl.c:876
 msgid "BAD"
 msgstr "SLABO"
 
-#: ../camel/camel-tcp-stream-openssl.c:700
-#, c-format
-msgid ""
-"Bad certificate from %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Do you wish to accept anyway?"
-msgstr ""
-"Zlonamerno potrdilo %s:\n"
-"\n"
-"%s\n"
-"\n"
-"%s\n"
-"\n"
-"Ga želite vseeno sprejeti?"
-
 #. construct our user prompt
-#: ../camel/camel-tcp-stream-ssl.c:883
+#: ../camel/camel-tcp-stream-ssl.c:880
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -2432,7 +2456,7 @@ msgstr ""
 "\n"
 "Ga želite vseeno sprejeti?"
 
-#: ../camel/camel-tcp-stream-ssl.c:927
+#: ../camel/camel-tcp-stream-ssl.c:924
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -2441,7 +2465,7 @@ msgstr ""
 "Napaka potrdila: %s\n"
 "Izdajatelj: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:979
+#: ../camel/camel-tcp-stream-ssl.c:976
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -2450,7 +2474,7 @@ msgstr ""
 "NapaÄ?na domena potrdila: %s\n"
 "Izdajatelj: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:997
+#: ../camel/camel-tcp-stream-ssl.c:994
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -2459,7 +2483,7 @@ msgstr ""
 "Potrdilo je preteklo: %s\n"
 "Izdajatelj: %s"
 
-#: ../camel/camel-tcp-stream-ssl.c:1014
+#: ../camel/camel-tcp-stream-ssl.c:1011
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -2473,18 +2497,18 @@ msgstr ""
 msgid "Could not parse URL '%s'"
 msgstr "Ni mogoÄ?e razÄ?leniti naslova URL '%s'"
 
-#: ../camel/camel-vee-folder.c:580
+#: ../camel/camel-vee-folder.c:576
 #, c-format
 msgid "Error storing '%s': %s"
-msgstr "Napaka pri shranjevanju '%s': %s"
+msgstr "Napaka med shranjevanjem '%s': %s"
 
-#: ../camel/camel-vee-folder.c:657
+#: ../camel/camel-vee-folder.c:653
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ni takÅ¡nega sporoÄ?ila %s v %s"
 
-#: ../camel/camel-vee-folder.c:816
-#: ../camel/camel-vee-folder.c:822
+#: ../camel/camel-vee-folder.c:812
+#: ../camel/camel-vee-folder.c:818
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ni mogoÄ?e kopirati ali premikati sporoÄ?il v Navidezno mapo"
 
@@ -2522,8 +2546,9 @@ msgstr ""
 "  %s"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:136
-#: ../camel/providers/local/camel-maildir-folder.c:262
-#: ../camel/providers/local/camel-maildir-folder.c:291
+#: ../camel/providers/local/camel-maildir-folder.c:264
+#: ../camel/providers/local/camel-maildir-folder.c:293
+#: ../camel/providers/local/camel-maildir-folder.c:401
 #: ../camel/providers/local/camel-mbox-folder.c:363
 #: ../camel/providers/local/camel-mbox-folder.c:414
 #: ../camel/providers/local/camel-mh-folder.c:226
@@ -2584,13 +2609,13 @@ msgstr "Preverjanje izbrisanih sporoÄ?il %s"
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1287
 msgid "Trash Folder Full. Please Empty."
-msgstr "Koš je pol. Prosim, izpraznite ga."
+msgstr "Koš je pol. Izpraznite ga."
 
 #: ../camel/providers/groupwise/camel-groupwise-folder.c:1521
 #: ../camel/providers/groupwise/camel-groupwise-store.c:633
 #: ../camel/providers/groupwise/camel-groupwise-store.c:763
-#: ../camel/providers/imap/camel-imap-folder.c:3421
-#: ../camel/providers/imap/camel-imap-folder.c:3497
+#: ../camel/providers/imap/camel-imap-folder.c:3423
+#: ../camel/providers/imap/camel-imap-folder.c:3499
 #, c-format
 msgid "Fetching summary information for new messages in %s"
 msgstr "PrenaÅ¡anje povzetkov novih sporoÄ?il v %s"
@@ -2654,11 +2679,11 @@ msgstr "Men novimi sporoÄ?ili preveri za neželeno poÅ¡to"
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:65
 #: ../camel/providers/imap/camel-imap-provider.c:74
 msgid "Only check for Junk messages in the IN_BOX folder"
-msgstr "Neželeno pošto preveri samo v mapi _prispele pošte"
+msgstr "Neželeno pošto preveri le v mapi _prispele pošte"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:67
 msgid "Automatically synchroni_ze account locally"
-msgstr "Samodejno _uskladi raÄ?un lokalno"
+msgstr "Samodejno _uskladi raÄ?un krajevno"
 
 #: ../camel/providers/groupwise/camel-groupwise-provider.c:72
 msgid "SOAP Settings"
@@ -2680,7 +2705,7 @@ msgstr "Za dostop do strežnikov Novell GroupWise"
 #: ../camel/providers/hula/camel-hula-provider.c:93
 #: ../camel/providers/imap/camel-imap-provider.c:100
 #: ../camel/providers/imap4/camel-imap4-provider.c:83
-#: ../camel/providers/imapp/camel-imapp-provider.c:67
+#: ../camel/providers/imapx/camel-imapx-provider.c:66
 #: ../camel/providers/nntp/camel-nntp-provider.c:74
 #: ../camel/providers/pop3/camel-pop3-provider.c:74
 msgid "Password"
@@ -2695,7 +2720,7 @@ msgid "Host or user not available in url"
 msgstr "Gostitelj ali uporabnik ni na voljo v url."
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:204
-#: ../camel/providers/imap/camel-imap-store.c:1358
+#: ../camel/providers/imap/camel-imap-store.c:1356
 msgid "You did not enter a password."
 msgstr "Niste vnesli gesla."
 
@@ -2704,8 +2729,9 @@ msgid "Some features may not work correctly with your current server version"
 msgstr "Nekatere možnosti z vaÅ¡o razliÄ?ico strežnika morda ne bodo delovale pravilno "
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:540
-#: ../camel/providers/imap/camel-imap-store.c:1849
-#: ../camel/providers/imap/camel-imap-store.c:2047
+#: ../camel/providers/imap/camel-imap-store.c:1879
+#: ../camel/providers/imap/camel-imap-store.c:2077
+#: ../camel/providers/imapx/camel-imapx-store.c:243
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
@@ -2715,8 +2741,8 @@ msgid "Cannot create GroupWise folders in offline mode."
 msgstr "Ni mogoÄ?e ustvariti mape GroupWise, ko niste na zvezi."
 
 #: ../camel/providers/groupwise/camel-groupwise-store.c:1280
-#: ../camel/providers/imap/camel-imap-store.c:1924
-#: ../camel/providers/imap/camel-imap-store.c:2304
+#: ../camel/providers/imap/camel-imap-store.c:1954
+#: ../camel/providers/imap/camel-imap-store.c:2334
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "V nadrejeni mapi ni dovoljeno vsebovati podmape"
 
@@ -2748,7 +2774,7 @@ msgstr "PoÅ¡iljanje sporoÄ?ila"
 
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:212
 msgid "You have exceeded this account's storage limit. Your messages are queued in your Outbox. Resend by pressing Send/Receive after deleting/archiving some of your mail.\n"
-msgstr "Presegli ste omejitev kapacitete raÄ?una. VaÅ¡a sporoÄ?ila Ä?akajo v Odhodni poÅ¡ti. Ko zbriÅ¡ete ali arhivirate nekaj poÅ¡te, sporoÄ?ila ponovno poÅ¡ljite z gumbom PoÅ¡lji/Prejmi.\n"
+msgstr "Presegli ste omejitev zmogljivosti raÄ?una. VaÅ¡a sporoÄ?ila Ä?akajo v Odhodni poÅ¡ti. Ko zbriÅ¡ete ali arhivirate nekaj poÅ¡te, sporoÄ?ila ponovno poÅ¡ljite z gumbom PoÅ¡lji/Prejmi.\n"
 
 #: ../camel/providers/groupwise/camel-groupwise-transport.c:214
 #: ../camel/providers/sendmail/camel-sendmail-transport.c:207
@@ -2787,7 +2813,7 @@ msgstr "Mape"
 #: ../camel/providers/imap/camel-imap-provider.c:62
 #: ../camel/providers/imap4/camel-imap4-provider.c:45
 msgid "_Show only subscribed folders"
-msgstr "Prikaži samo naroÄ?ene _mape"
+msgstr "Prikaži le naroÄ?ene _mape"
 
 #: ../camel/providers/hula/camel-hula-provider.c:64
 #: ../camel/providers/imap/camel-imap-provider.c:64
@@ -2824,12 +2850,12 @@ msgstr "Ni dovodnega pretoka"
 #: ../camel/providers/imap/camel-imap-command.c:229
 #: ../camel/providers/imap/camel-imap-command.c:278
 #: ../camel/providers/imap/camel-imap-command.c:492
-#: ../camel/providers/imap/camel-imap-store.c:3051
+#: ../camel/providers/imap/camel-imap-store.c:3088
 msgid "Operation cancelled"
 msgstr "Dejanje preklicano"
 
 #: ../camel/providers/imap/camel-imap-command.c:331
-#: ../camel/providers/imap/camel-imap-store.c:3056
+#: ../camel/providers/imap/camel-imap-store.c:3093
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Povezava s strežnikom je bila nepriÄ?akovano prekinjena: %s"
@@ -2882,7 +2908,7 @@ msgstr "Ni mogoÄ?e ustvariti mape %s: %s"
 #: ../camel/providers/imap/camel-imap-folder.c:919
 #, c-format
 msgid "Scanning for changed messages in %s"
-msgstr "Pregledovanje spremenjenih sporoÄ?il v %s"
+msgstr "Preiskovanje spremenjenih sporoÄ?il v %s"
 
 #: ../camel/providers/imap/camel-imap-folder.c:1987
 #, c-format
@@ -2912,22 +2938,22 @@ msgid "No such message available."
 msgstr "Na voljo ni takÅ¡nega sporoÄ?ila."
 
 #: ../camel/providers/imap/camel-imap-folder.c:2975
-#: ../camel/providers/imap/camel-imap-folder.c:3808
+#: ../camel/providers/imap/camel-imap-folder.c:3810
 #: ../camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "To sporoÄ?ilo trenutno ni na voljo"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3624
+#: ../camel/providers/imap/camel-imap-folder.c:3626
 #, c-format
 msgid "Incomplete server response: no information provided for message %d"
 msgstr "Nepopoln odgovor strežnika: za sporoÄ?ilo %d ni ponujenih podatkov"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3632
+#: ../camel/providers/imap/camel-imap-folder.c:3634
 #, c-format
 msgid "Incomplete server response: no UID provided for message %d"
 msgstr "Nepopoln odgovor strežnika: za sporoÄ?ilo %d ni ponujen UID"
 
-#: ../camel/providers/imap/camel-imap-folder.c:3846
+#: ../camel/providers/imap/camel-imap-folder.c:3848
 msgid "Could not find message body in FETCH response."
 msgstr "Ni mogoÄ?e najti telesa sporoÄ?ila v odgovoru FETCH."
 
@@ -2971,7 +2997,7 @@ msgstr "Neželeno poÅ¡to preveri med vsemi novimi sporoÄ?ili"
 #: ../camel/providers/imap/camel-imap-provider.c:76
 #: ../camel/providers/imap4/camel-imap4-provider.c:59
 msgid "Automatically synchroni_ze remote mail locally"
-msgstr "Samodejno sinhroni_ziraj oddaljeno in lokalno pošto"
+msgstr "Samodejno sinhroni_ziraj oddaljeno in krajevno pošto"
 
 #: ../camel/providers/imap/camel-imap-provider.c:83
 msgid "IMAP"
@@ -2982,24 +3008,24 @@ msgid "For reading and storing mail on IMAP servers."
 msgstr "Za branje in hranjenje pošte na strežnikih IMAP."
 
 #: ../camel/providers/imap/camel-imap-provider.c:102
-#: ../camel/providers/imapp/camel-imapp-provider.c:69
+#: ../camel/providers/imapx/camel-imapx-provider.c:68
 msgid "This option will connect to the IMAP server using a plaintext password."
 msgstr "Ta možnost bo vzpostavila povezavo s strežnikom IMAP z nešifriranim geslom."
 
-#: ../camel/providers/imap/camel-imap-store.c:437
+#: ../camel/providers/imap/camel-imap-store.c:435
 #: ../camel/providers/imap4/camel-imap4-store.c:210
 #, c-format
 msgid "IMAP server %s"
 msgstr "Strežnik IMAP %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:439
+#: ../camel/providers/imap/camel-imap-store.c:437
 #: ../camel/providers/imap4/camel-imap4-store.c:212
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Storitev IMAP za %s na %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:568
-#: ../camel/providers/imap/camel-imap-store.c:583
+#: ../camel/providers/imap/camel-imap-store.c:566
+#: ../camel/providers/imap/camel-imap-store.c:581
 #: ../camel/providers/imap4/camel-imap4-store.c:247
 #: ../camel/providers/imap4/camel-imap4-store.c:262
 #: ../camel/providers/nntp/camel-nntp-store.c:182
@@ -3012,7 +3038,7 @@ msgstr "Storitev IMAP za %s na %s"
 msgid "Could not connect to %s: %s"
 msgstr "Ni se mogoÄ?e povezati s %s: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:569
+#: ../camel/providers/imap/camel-imap-store.c:567
 #: ../camel/providers/imap4/camel-imap4-store.c:248
 #: ../camel/providers/nntp/camel-nntp-store.c:183
 #: ../camel/providers/pop3/camel-pop3-store.c:171
@@ -3020,15 +3046,16 @@ msgstr "Ni se mogoÄ?e povezati s %s: %s"
 msgid "SSL unavailable"
 msgstr "SSL ni na voljo"
 
-#: ../camel/providers/imap/camel-imap-store.c:580
-#: ../camel/providers/imap/camel-imap-store.c:862
+#: ../camel/providers/imap/camel-imap-store.c:578
+#: ../camel/providers/imap/camel-imap-store.c:860
+#: ../camel/providers/imapx/camel-imapx-server.c:1523
 msgid "Connection cancelled"
 msgstr "Povezava prekinjena"
 
-#: ../camel/providers/imap/camel-imap-store.c:691
-#: ../camel/providers/imap/camel-imap-store.c:710
-#: ../camel/providers/imap/camel-imap-store.c:716
-#: ../camel/providers/imap/camel-imap-store.c:742
+#: ../camel/providers/imap/camel-imap-store.c:689
+#: ../camel/providers/imap/camel-imap-store.c:708
+#: ../camel/providers/imap/camel-imap-store.c:714
+#: ../camel/providers/imap/camel-imap-store.c:740
 #: ../camel/providers/imap4/camel-imap4-store.c:310
 #: ../camel/providers/imap4/camel-imap4-store.c:325
 #: ../camel/providers/imap4/camel-imap4-store.c:334
@@ -3036,53 +3063,53 @@ msgstr "Povezava prekinjena"
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Povezava s strežnikom IMAP %s v varnem naÄ?inu ni uspela: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:692
+#: ../camel/providers/imap/camel-imap-store.c:690
 #: ../camel/providers/smtp/camel-smtp-transport.c:332
 msgid "STARTTLS not supported"
 msgstr "STARTTLS ni podprt"
 
-#: ../camel/providers/imap/camel-imap-store.c:711
+#: ../camel/providers/imap/camel-imap-store.c:709
 msgid "SSL negotiations failed"
 msgstr "Pogajanje SSL ni uspelo"
 
-#: ../camel/providers/imap/camel-imap-store.c:717
+#: ../camel/providers/imap/camel-imap-store.c:715
 #: ../camel/providers/imap4/camel-imap4-store.c:335
 #: ../camel/providers/smtp/camel-smtp-transport.c:371
 msgid "SSL is not available in this build"
 msgstr "SSL v tej izdaji ni na voljo"
 
-#: ../camel/providers/imap/camel-imap-store.c:865
+#: ../camel/providers/imap/camel-imap-store.c:863
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Ni se mogoÄ?e povezati z ukazom \"%s\": %s"
 
 #. create a dummy "." parent inbox, use to scan, then put back at the top level
-#: ../camel/providers/imap/camel-imap-store.c:1053
-#: ../camel/providers/imap/camel-imap-store.c:2400
+#: ../camel/providers/imap/camel-imap-store.c:1051
+#: ../camel/providers/imap/camel-imap-store.c:2430
 #: ../camel/providers/imap4/camel-imap4-store-summary.c:356
 #: ../camel/providers/imap4/camel-imap4-store.c:1403
-#: ../camel/providers/local/camel-maildir-folder.c:80
+#: ../camel/providers/imapx/camel-imapx-store.c:444
+#: ../camel/providers/local/camel-maildir-folder.c:81
 #: ../camel/providers/local/camel-maildir-store.c:219
 #: ../camel/providers/local/camel-maildir-store.c:291
 #: ../camel/providers/local/camel-maildir-store.c:517
 #: ../camel/providers/local/camel-maildir-store.c:530
 #: ../camel/providers/local/camel-spool-store.c:463
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:264
 msgid "Inbox"
 msgstr "Prejeto"
 
-#: ../camel/providers/imap/camel-imap-store.c:1305
+#: ../camel/providers/imap/camel-imap-store.c:1303
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Strežnik IMAP %s ne podpira zahtevanega naÄ?ina overitve %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1315
+#: ../camel/providers/imap/camel-imap-store.c:1313
 #: ../camel/providers/smtp/camel-smtp-transport.c:506
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Ni podpore za naÄ?in overitve %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:1389
+#: ../camel/providers/imap/camel-imap-store.c:1387
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -3093,14 +3120,14 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: ../camel/providers/imap/camel-imap-store.c:1861
-#: ../camel/providers/imap/camel-imap-store.c:2242
+#: ../camel/providers/imap/camel-imap-store.c:1891
+#: ../camel/providers/imap/camel-imap-store.c:2272
 #: ../camel/providers/imap4/camel-imap4-store.c:954
 #, c-format
 msgid "The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Ime mape \"%s\" je neveljavno, ker vsebuje znak \"%c\""
 
-#: ../camel/providers/imap/camel-imap-store.c:1978
+#: ../camel/providers/imap/camel-imap-store.c:2008
 #: ../camel/providers/local/camel-maildir-store.c:192
 #: ../camel/providers/local/camel-mbox-store.c:204
 #: ../camel/providers/local/camel-mh-store.c:249
@@ -3108,12 +3135,12 @@ msgstr "Ime mape \"%s\" je neveljavno, ker vsebuje znak \"%c\""
 msgid "Cannot create folder '%s': folder exists."
 msgstr "Ni mogoÄ?e ustvariti mape '%s': mapa že obstaja."
 
-#: ../camel/providers/imap/camel-imap-store.c:2253
+#: ../camel/providers/imap/camel-imap-store.c:2283
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznana nadrejena mapa: %s"
 
-#: ../camel/providers/imap/camel-imap-store.c:3053
+#: ../camel/providers/imap/camel-imap-store.c:3090
 msgid "Server unexpectedly disconnected"
 msgstr "Povezava s strežnikom je bila nepriÄ?akovano prekinjena"
 
@@ -3210,7 +3237,7 @@ msgstr "Ni mogoÄ?e dobiti sporoÄ?ila %s iz mape '%s': napaÄ?en ukaz"
 #: ../camel/providers/imap4/camel-imap4-folder.c:940
 #, c-format
 msgid "Cannot append message to folder '%s': Folder is read-only"
-msgstr "Ni mogoÄ?e pripeti sporoÄ?ila v mapo '%s': mapa je samo za branje"
+msgstr "Ni mogoÄ?e pripeti sporoÄ?ila v mapo '%s': mapa je le za branje"
 
 #: ../camel/providers/imap4/camel-imap4-folder.c:1033
 #, c-format
@@ -3248,7 +3275,7 @@ msgstr "V novih sporoÄ?ilih preveri neželeno poÅ¡to"
 
 #: ../camel/providers/imap4/camel-imap4-provider.c:57
 msgid "Only check for Junk messa_ges in the INBOX folder"
-msgstr "_Neželeno pošto preveri samo v mapi INBOX"
+msgstr "_Neželeno pošto preveri le v mapi INBOX"
 
 #: ../camel/providers/imap4/camel-imap4-provider.c:66
 msgid "IMAP4rev1"
@@ -3263,7 +3290,6 @@ msgid "This option will connect to the IMAPv4rev1 server using a plaintext passw
 msgstr "Ta možnost bo vzpostavila povezavo s strežnikom IMAPv4rev1 z uporabo nešifriranega gesla."
 
 #: ../camel/providers/imap4/camel-imap4-store.c:259
-#: ../camel/providers/imapp/camel-imapp-store.c:249
 #: ../camel/providers/nntp/camel-nntp-store.c:194
 #: ../camel/providers/nntp/camel-nntp-store.c:213
 #: ../camel/providers/pop3/camel-pop3-store.c:181
@@ -3396,7 +3422,7 @@ msgstr "Ni mogoÄ?e preklicati naroÄ?nine na mapo '%s': napaÄ?en ukaz"
 
 #: ../camel/providers/imap4/camel-imap4-summary.c:1590
 msgid "Scanning for changed messages"
-msgstr "Pregledujem za spremenjenimi sporoÄ?ili"
+msgstr "Preiskovanje spremenjenih sporoÄ?il"
 
 #: ../camel/providers/imap4/camel-imap4-summary.c:1611
 #, c-format
@@ -3421,16 +3447,16 @@ msgstr "Ni podatkov"
 msgid "IMAP server %s unexpectedly disconnected: %s"
 msgstr "Strežnik IMAP %s je nepriÄ?akovano prekinil povezavo: %s"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:41
+#: ../camel/providers/imapx/camel-imapx-provider.c:40
 #: ../camel/providers/pop3/camel-pop3-provider.c:43
 msgid "Message storage"
 msgstr "Hramba sporoÄ?il"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:49
+#: ../camel/providers/imapx/camel-imapx-provider.c:48
 msgid "IMAP+"
 msgstr "IMAP+"
 
-#: ../camel/providers/imapp/camel-imapp-provider.c:51
+#: ../camel/providers/imapx/camel-imapx-provider.c:50
 msgid ""
 "Experimental IMAP 4(.1) client\n"
 "This is untested and unsupported code, you want to use plain imap instead.\n"
@@ -3442,12 +3468,18 @@ msgstr ""
 "\n"
 " !!! NE UPORABLJAJTE ZA VSAKODNEVNO RABO !!!\n"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:252
+#: ../camel/providers/imapx/camel-imapx-server.c:1526
 #, c-format
 msgid "Could not connect to %s (port %s): %s"
 msgstr "Ni se mogoÄ?e povezati s %s (vrata %s): %s"
 
-#: ../camel/providers/imapp/camel-imapp-store.c:348
+#: ../camel/providers/imapx/camel-imapx-server.c:1556
+#: ../camel/providers/imapx/camel-imapx-store.c:143
+#, c-format
+msgid "%sPlease enter the IMAP password for %s %s"
+msgstr "%sVnesite IMAP geslo za %s %s"
+
+#: ../camel/providers/imapx/camel-imapx-store.c:126
 #, c-format
 msgid "Could not connect to POP server on %s"
 msgstr "Ni se mogoÄ?e povezati s strežnikom POP na %s"
@@ -3493,7 +3525,7 @@ msgstr "Krajevna dostava"
 
 #: ../camel/providers/local/camel-local-provider.c:74
 msgid "For retrieving (moving) local mail from standard mbox-formatted spools into folders managed by Evolution."
-msgstr "Za pridobivanje (premikanje) lokalne poÅ¡te iz obiÄ?ajnih map spool vrste mbox v mape, ki jih upravlja Evolution."
+msgstr "Za pridobivanje (premikanje) krajevne poÅ¡te iz obiÄ?ajnih map spool vrste mbox v mape, ki jih upravlja Evolution."
 
 #: ../camel/providers/local/camel-local-provider.c:88
 #: ../camel/providers/local/camel-local-provider.c:107
@@ -3522,7 +3554,7 @@ msgid ""
 "For reading and storing local mail in external standard mbox spool files.\n"
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
-"Za branje in shranjevanje lokalne poÅ¡te v obiÄ?ajnih zunanjih datotekah mbox spool.\n"
+"Za branje in shranjevanje krajevne poÅ¡te v obiÄ?ajnih zunanjih datotekah mbox spool.\n"
 "Uporabno tudi za branje drevesa map v slogu programov Elm, Pine in Mutt."
 
 #: ../camel/providers/local/camel-local-provider.c:126
@@ -3551,7 +3583,7 @@ msgstr "Ni mogoÄ?e dobiti mape: %s: %s"
 
 #: ../camel/providers/local/camel-local-store.c:201
 msgid "Local stores do not have an inbox"
-msgstr "Lokalne shrambe nimajo mape za dohodno pošto"
+msgstr "Krajevne shrambe nimajo mape za dohodno pošto"
 
 #: ../camel/providers/local/camel-local-store.c:247
 #, c-format
@@ -3584,19 +3616,20 @@ msgstr "Ni mogoÄ?e izbrisati metadatoteke mape '%s': %s"
 msgid "Unable to add message to summary: unknown reason"
 msgstr "Ni mogoÄ?e dodati sporoÄ?ila k povzetku: razlog neznan"
 
-#: ../camel/providers/local/camel-maildir-folder.c:228
+#: ../camel/providers/local/camel-maildir-folder.c:230
 msgid "Maildir append message canceled"
 msgstr "Dodajanje sporoÄ?ila v mailidr preklicano"
 
-#: ../camel/providers/local/camel-maildir-folder.c:231
+#: ../camel/providers/local/camel-maildir-folder.c:233
 #, c-format
 msgid "Cannot append message to maildir folder: %s: %s"
 msgstr "Ni mogoÄ?e dodati sporoÄ?ila v mapo vrste maildir: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:261
-#: ../camel/providers/local/camel-maildir-folder.c:290
-#: ../camel/providers/local/camel-maildir-folder.c:304
-#: ../camel/providers/local/camel-maildir-folder.c:312
+#: ../camel/providers/local/camel-maildir-folder.c:263
+#: ../camel/providers/local/camel-maildir-folder.c:292
+#: ../camel/providers/local/camel-maildir-folder.c:306
+#: ../camel/providers/local/camel-maildir-folder.c:314
+#: ../camel/providers/local/camel-maildir-folder.c:400
 #: ../camel/providers/local/camel-mbox-folder.c:362
 #: ../camel/providers/local/camel-mbox-folder.c:413
 #: ../camel/providers/local/camel-mbox-folder.c:434
@@ -3613,10 +3646,14 @@ msgstr ""
 "Ni mogoÄ?e dobiti sporoÄ?ila: %s iz mape %s\n"
 "  %s"
 
-#: ../camel/providers/local/camel-maildir-folder.c:313
+#: ../camel/providers/local/camel-maildir-folder.c:315
 msgid "Invalid message contents"
 msgstr "Neveljavna vsebina sporoÄ?ila"
 
+#: ../camel/providers/local/camel-maildir-folder.c:419
+msgid "Cannot transfer message to destination folder"
+msgstr "Ni mogoÄ?e prenesti sporoÄ?ila v ciljno mapo"
+
 #: ../camel/providers/local/camel-maildir-store.c:148
 #: ../camel/providers/local/camel-maildir-store.c:173
 #: ../camel/providers/local/camel-mbox-store.c:176
@@ -3660,23 +3697,23 @@ msgstr "ni mapa vrste maildir"
 #: ../camel/providers/local/camel-spool-store.c:344
 #, c-format
 msgid "Could not scan folder '%s': %s"
-msgstr "Ni mogoÄ?e prebrati mape '%s': %s"
+msgstr "Ni mogoÄ?e preiskati mape '%s': %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:437
-#: ../camel/providers/local/camel-maildir-summary.c:556
+#: ../camel/providers/local/camel-maildir-summary.c:432
+#: ../camel/providers/local/camel-maildir-summary.c:551
 #, c-format
 msgid "Cannot open maildir directory path: %s: %s"
 msgstr "Ni mogoÄ?e odprti poÅ¡tne mape maildir: %s: %s"
 
-#: ../camel/providers/local/camel-maildir-summary.c:549
+#: ../camel/providers/local/camel-maildir-summary.c:544
 msgid "Checking folder consistency"
 msgstr "Preverjanje skladnosti mape"
 
-#: ../camel/providers/local/camel-maildir-summary.c:658
+#: ../camel/providers/local/camel-maildir-summary.c:637
 msgid "Checking for new messages"
 msgstr "Preverjanje novih sporoÄ?il"
 
-#: ../camel/providers/local/camel-maildir-summary.c:748
+#: ../camel/providers/local/camel-maildir-summary.c:724
 #: ../camel/providers/local/camel-mbox-summary.c:526
 #: ../camel/providers/local/camel-mbox-summary.c:722
 #: ../camel/providers/local/camel-mbox-summary.c:842
@@ -4029,7 +4066,7 @@ msgid ""
 "\n"
 "%s"
 msgstr ""
-"Napaka pri pridobivanju sporoÄ?il noviÄ?arskih skupin:\n"
+"Napaka med pridobivanjem sporoÄ?il noviÄ?arskih skupin:\n"
 "\n"
 "%s"
 
@@ -4092,7 +4129,7 @@ msgstr "Ni takšne mape: %s"
 #: ../camel/providers/nntp/camel-nntp-summary.c:370
 #, c-format
 msgid "%s: Scanning new messages"
-msgstr "%s: Pregledujem za novimi sporoÄ?ili"
+msgstr "%s: preiskovanje novih sporoÄ?il"
 
 #: ../camel/providers/nntp/camel-nntp-summary.c:279
 #, c-format
@@ -4111,7 +4148,7 @@ msgstr "Uporabite preklic"
 #: ../camel/providers/nntp/camel-nntp-summary.c:422
 #, c-format
 msgid "Operation failed: %s"
-msgstr "Operacija ni uspela: %s"
+msgstr "Opravilo ni uspela: %s"
 
 #: ../camel/providers/pop3/camel-pop3-folder.c:253
 msgid "Retrieving POP summary"
@@ -4226,7 +4263,7 @@ msgstr "Overitev na strežniku POP %s ni uspela: %s"
 #: ../camel/providers/pop3/camel-pop3-store.c:508
 #, c-format
 msgid "Unable to connect to POP server %s:\tInvalid APOP ID received. Impersonation attack suspected. Please contact your admin."
-msgstr "Povezava s strežnikom POP %s ni uspela::\tSprejet neveljaven APOP ID. Domneven poskus uporabe tujih osebnih podatkov. Prosim, poiÅ¡Ä?ite pomoÄ? pri skrbniku sistema."
+msgstr "Povezava s strežnikom POP %s ni uspela::\tSprejet neveljaven APOP ID. Domneven poskus uporabe tujih osebnih podatkov. PoiÅ¡Ä?ite pomoÄ? pri skrbniku sistema."
 
 #: ../camel/providers/pop3/camel-pop3-store.c:549
 #: ../camel/providers/pop3/camel-pop3-store.c:562
@@ -4236,7 +4273,7 @@ msgid ""
 "Error sending password: %s"
 msgstr ""
 "Ni se mogoÄ?e povezati s strežnikom POP %s.\n"
-"Napaka pri pošiljanju gesla: %s"
+"Napaka med pošiljanjem gesla: %s"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:556
 #, c-format
@@ -4245,7 +4282,7 @@ msgid ""
 "Error sending username: %s"
 msgstr ""
 "Ni se mogoÄ?e povezati s strežnikom POP %s.\n"
-"Napaka pri pošiljanju uporabniškega imena: %s"
+"Napaka med pošiljanjem uporabniškega imena: %s"
 
 #: ../camel/providers/pop3/camel-pop3-store.c:669
 #, c-format
@@ -4363,7 +4400,7 @@ msgstr "Zahtevano dejanje prekinjeno: napaka ob obdelavi"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:195
 msgid "User not local; please try <forward-path>"
-msgstr "Uporabnik ni krajeven; prosimo poskusite <forward-path>"
+msgstr "Uporabnik ni krajeven; poskusite <forward-path>"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:197
 msgid "Requested action not taken: insufficient system storage"
@@ -4486,7 +4523,7 @@ msgstr "Overitev SMTP"
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1099
 msgid "Error creating SASL authentication object."
-msgstr "Napaka pri ustvarjanju overitvenega predmeta SASL."
+msgstr "Napaka med ustvarjanjem overitvenega predmeta SASL."
 
 #: ../camel/providers/smtp/camel-smtp-transport.c:1116
 #: ../camel/providers/smtp/camel-smtp-transport.c:1127
@@ -4812,8 +4849,8 @@ msgid "Category _Name"
 msgstr "I_me kategorije"
 
 #: ../libedataserverui/e-categories-dialog.ui.h:5
-msgid "Item(s) belong to these _categories:"
-msgstr "Stik(i) pripada(jo) naslednjim _kategorijam:"
+msgid "Item(s) _belong to these categories:"
+msgstr "Predmeti, ki pripadajo _kategorijam:"
 
 #: ../libedataserverui/e-categories-dialog.ui.h:6
 msgid "_Available Categories:"
@@ -4838,7 +4875,7 @@ msgstr "Podrobnosti barve"
 
 #: ../libedataserverui/e-cell-renderer-color.c:223
 msgid "The color to render"
-msgstr "Oblikovanje barve"
+msgstr "Izrisovanje barve"
 
 #: ../libedataserverui/e-name-selector-dialog.c:292
 msgid "Select Contacts from Address Book"
@@ -4882,7 +4919,6 @@ msgid "Cate_gory:"
 msgstr "K_ategorija:"
 
 #: ../libedataserverui/e-name-selector-dialog.ui.h:8
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:261
 msgid "Contacts"
 msgstr "Stiki"
 
@@ -4895,25 +4931,25 @@ msgid "_Search:"
 msgstr "I_skanje:"
 
 #. To Translators: This would be similiar to "Expand MyList Inline" where MyList is a Contact List
-#: ../libedataserverui/e-name-selector-entry.c:2494
+#: ../libedataserverui/e-name-selector-entry.c:2508
 #, c-format
 msgid "E_xpand %s Inline"
 msgstr "MedvrstiÄ?no ra_zÅ¡iri %s"
 
 #. Copy Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2509
+#: ../libedataserverui/e-name-selector-entry.c:2523
 #, c-format
 msgid "Cop_y %s"
 msgstr "_Kopiraj %s"
 
 #. Cut Contact Item
-#: ../libedataserverui/e-name-selector-entry.c:2519
+#: ../libedataserverui/e-name-selector-entry.c:2533
 #, c-format
 msgid "C_ut %s"
 msgstr "_Izreži %s"
 
 #. Edit Contact item
-#: ../libedataserverui/e-name-selector-entry.c:2536
+#: ../libedataserverui/e-name-selector-entry.c:2550
 #, c-format
 msgid "_Edit %s"
 msgstr "_Uredi %s"
@@ -4957,168 +4993,6 @@ msgstr "Izberi cilj"
 msgid "_Destination"
 msgstr "_Cilj"
 
-#: ../servers/exchange/lib/e2k-autoconfig.c:1694
-#: ../servers/exchange/storage/exchange-account.c:954
-#, c-format
-msgid "Enter password for %s"
-msgstr "Vnesite geslo za %s"
-
-#: ../servers/exchange/lib/e2k-autoconfig.c:1695
-#: ../servers/exchange/storage/exchange-account.c:959
-msgid "Enter password"
-msgstr "Vnesite geslo"
-
-#. i18n: These are Outlook's words for the default roles in
-#. the folder permissions dialog.
-#: ../servers/exchange/lib/e2k-security-descriptor.c:844
-msgid "Owner"
-msgstr "Lastnik"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:854
-msgid "Publishing Editor"
-msgstr "Urednik objave"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:862
-msgid "Editor"
-msgstr "Urednik"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:869
-msgid "Publishing Author"
-msgstr "Avtor objave"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:875
-msgid "Author"
-msgstr "Avtor"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:880
-msgid "Non-editing Author"
-msgstr "Avtor, ki ne ureja"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:884
-msgid "Reviewer"
-msgstr "Pregledovalec"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:886
-msgid "Contributor"
-msgstr "Sodelavec"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:888
-msgid "None"
-msgstr "brez"
-
-#: ../servers/exchange/lib/e2k-security-descriptor.c:903
-msgid "Custom"
-msgstr "Po meri"
-
-#: ../servers/exchange/storage/e-storage.c:557
-msgid "Generic error"
-msgstr "GeneriÄ?na napaka"
-
-#: ../servers/exchange/storage/e-storage.c:559
-msgid "A folder with the same name already exists"
-msgstr "Mapa z enakim imenom že obstaja"
-
-#: ../servers/exchange/storage/e-storage.c:561
-msgid "The specified folder type is not valid"
-msgstr "Izbrana vrsta mape ni veljavna"
-
-#: ../servers/exchange/storage/e-storage.c:563
-msgid "I/O error"
-msgstr "V/I napaka"
-
-#: ../servers/exchange/storage/e-storage.c:565
-msgid "Not enough space to create the folder"
-msgstr "Ni dovolj prostora za ustvaritev mape"
-
-#: ../servers/exchange/storage/e-storage.c:567
-msgid "The folder is not empty"
-msgstr "Mapa ni prazna"
-
-#: ../servers/exchange/storage/e-storage.c:569
-msgid "The specified folder was not found"
-msgstr "Izbrana mapa ni bila najdena"
-
-#: ../servers/exchange/storage/e-storage.c:571
-msgid "Function not implemented in this storage"
-msgstr "Funkcija ni implementirana v tem hranilniku"
-
-#: ../servers/exchange/storage/e-storage.c:575
-msgid "Operation not supported"
-msgstr "Operacija ni podprta"
-
-#: ../servers/exchange/storage/e-storage.c:577
-msgid "The specified type is not supported in this storage"
-msgstr "Izbrana vrsta ni podprta v tem hranilniku"
-
-#: ../servers/exchange/storage/e-storage.c:579
-msgid "The specified folder cannot be modified or removed"
-msgstr "Izbrane mape ni mogoÄ?e spremeniti ali odstraniti"
-
-#: ../servers/exchange/storage/e-storage.c:581
-msgid "Cannot make a folder a child of one of its descendants"
-msgstr "Ni mogoÄ?e doloÄ?iti mape kot podrejene."
-
-#: ../servers/exchange/storage/e-storage.c:583
-msgid "Cannot create a folder with that name"
-msgstr "Ni mogoÄ?e ustvariti mape s takÅ¡nim imenom"
-
-#: ../servers/exchange/storage/e-storage.c:585
-msgid "This operation cannot be performed in off-line mode"
-msgstr "Operacije ni mogoÄ?e izvesti v naÄ?inu brez povezave"
-
-#. i18n: This is the title of an "other user's folders"
-#. hierarchy. Eg, "John Doe's Folders".
-#: ../servers/exchange/storage/exchange-account.c:639
-#, c-format
-msgid "%s's Folders"
-msgstr "Mape osebe %s"
-
-#: ../servers/exchange/storage/exchange-account.c:1259
-msgid "Personal Folders"
-msgstr "Osebne mape"
-
-#: ../servers/exchange/storage/exchange-account.c:1274
-msgid "Favorite Public Folders"
-msgstr "Priljubljene javne mape"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1291
-msgid "All Public Folders"
-msgstr "Vse javne mape"
-
-#. i18n: Outlookism
-#: ../servers/exchange/storage/exchange-account.c:1305
-msgid "Global Address List"
-msgstr "Globalni seznam naslovov"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:262
-msgid "Deleted Items"
-msgstr "Zbrisani predmeti"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:263
-msgid "Drafts"
-msgstr "Osnutki"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:265
-msgid "Journal"
-msgstr "Dnevnik"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:266
-msgid "Notes"
-msgstr "Opombe"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:267
-msgid "Outbox"
-msgstr "Odhodna pošta"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:268
-msgid "Sent Items"
-msgstr "Poslano"
-
-#: ../servers/exchange/storage/exchange-hierarchy-foreign.c:269
-msgid "Tasks"
-msgstr "Naloge"
-
 #: ../servers/groupwise/e-gw-connection.c:225
 msgid "Invalid connection"
 msgstr "Neveljavna povezava"
@@ -5135,22 +5009,6 @@ msgstr "Brez odgovora strežnika"
 msgid "Bad parameter"
 msgstr "NapaÄ?en parameter"
 
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:1
-msgid "Evolution Addressbook file backend"
-msgstr "Hrbtenica imenika Evolution"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:2
-msgid "Evolution Calendar file and webcal backend"
-msgstr "Hrbtni del datoteke Evolution Calendar in webcala"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:3
-msgid "Evolution Data Server interface check service"
-msgstr "Storitev za preverjanje vmesnika Evolution Data Server"
-
-#: ../src/GNOME_Evolution_DataServer.server.in.in.h:4
-msgid "Evolution Data Server logging service"
-msgstr "Dnevniška storitev Evolution Data Server"
-
 #~ msgid "\"%s\" on book before \"%s\""
 #~ msgstr "\"%s\" v knjigi pred \"%s\""
 #~ msgid "book busy"
@@ -5158,19 +5016,188 @@ msgstr "Dnevniška storitev Evolution Data Server"
 #~ msgid "CORBA exception making \"%s\" call"
 #~ msgstr "Izjema CORBA pri klicu \"%s\""
 #~ msgid "%s: there is no current operation"
-#~ msgstr "%s: ni trenutne operacije"
+#~ msgstr "%s: ni trenutnega opravila"
 #~ msgid "%s: could not cancel"
 #~ msgstr "%s: ni mogoÄ?e preklicati"
 #~ msgid "\"%s\" on book after \"%s\""
 #~ msgstr "\"%s\" v knjigi za \"%s\""
 #~ msgid "%s: canceled"
 #~ msgstr "%s: preklicano"
-#~ msgid "%s: Invalid source."
-#~ msgstr "%s: Neveljaven vir."
 #~ msgid "%s: no factories available for URI `%s'"
 #~ msgstr "%s: nobena tovarna ni na voljo za URI '%s'"
 #~ msgid "%s: Could not create EBookListener"
 #~ msgstr "%s: Ni mogoÄ?e ustvariti EBookListenerja"
+#~ msgid "Kerberos 4"
+#~ msgstr "Kerberos 4"
+#~ msgid ""
+#~ "This option will connect to the server using Kerberos 4 authentication."
+#~ msgstr ""
+#~ "Ta možnost bo vzpostavila povezavo s strežnikom z uporabo overitve "
+#~ "Kerberos 4."
+#~ msgid ""
+#~ "Could not get Kerberos ticket:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Ni mogoÄ?e dobiti Kerberos vstopnice:\n"
+#~ "%s"
+#~ msgid "Unable to get issuer's certificate"
+#~ msgstr "Ni mogoÄ?e dobiti izdajateljevega potrdila."
+#~ msgid "Unable to get Certificate Revocation List"
+#~ msgstr "Ni mogoÄ?e dobiti seznama preklica potrdil"
+#~ msgid "Unable to decrypt certificate signature"
+#~ msgstr "Ni mogoÄ?e deÅ¡ifrirati podpisa potrdila"
+#~ msgid "Unable to decrypt Certificate Revocation List signature"
+#~ msgstr "Ni mogoÄ?e deÅ¡ifrirati podpisa seznama preklica potrdil"
+#~ msgid "Unable to decode issuer's public key"
+#~ msgstr "Ni mogoÄ?e deÅ¡ifrirati javnega kljuÄ?a izdajatelja"
+#~ msgid "Certificate signature failure"
+#~ msgstr "Napaka podpisa potrdila"
+#~ msgid "Certificate Revocation List signature failure"
+#~ msgstr "Napaka v podpisu seznama preklica potrdil"
+#~ msgid "Certificate not yet valid"
+#~ msgstr "Potrdilo Å¡e ni veljavno"
+#~ msgid "Certificate has expired"
+#~ msgstr "Potrdilo je preteklo"
+#~ msgid "Certificate Revocation List (CRL) not yet valid"
+#~ msgstr "Seznam preklicev (CRL) Å¡e ni overjen"
+#~ msgid "Certificate Revocation List (CRL) has expired"
+#~ msgstr "Seznam preklica (CRL) je potekel"
+#~ msgid "Error in Certificate Revocation List (CRL)"
+#~ msgstr "Napaka na seznamu preklica potrdil (CRL)"
+#~ msgid "Out of memory"
+#~ msgstr "Zmanjkalo je pomnilnika"
+#~ msgid "Zero-depth self-signed certificate"
+#~ msgstr "Samopodpisano potrdilo niÄ?te globine"
+#~ msgid "Self-signed certificate in chain"
+#~ msgstr "Samopodpisano potrdilo v verigi"
+#~ msgid "Unable to get issuer's certificate locally"
+#~ msgstr "Ni mogoÄ?e krajevno dobiti izdajateljevega potrdila"
+#~ msgid "Unable to verify leaf signature"
+#~ msgstr "Ni mogoÄ?e preveriti podpisa lista"
+#~ msgid "Certificate chain too long"
+#~ msgstr "Veriga potrdil je predolga"
+#~ msgid "Certificate Revoked"
+#~ msgstr "Potrdilo je preklicano"
+#~ msgid "Invalid Certificate Authority (CA)"
+#~ msgstr "Neveljavni pooblastitelj potrdil (CA)"
+#~ msgid "Path length exceeded"
+#~ msgstr "Dolžina poti presežena"
+#~ msgid "Invalid purpose"
+#~ msgstr "Neveljaven namen"
+#~ msgid "Certificate untrusted"
+#~ msgstr "Potrdilu ni mogoÄ?e zaupati"
+#~ msgid "Certificate rejected"
+#~ msgstr "Potrdilo je zavrnjeno"
+#~ msgid "Subject/Issuer mismatch"
+#~ msgstr "Neskladnost zadeve in izdajatelja"
+#~ msgid "AKID/SKID mismatch"
+#~ msgstr "Neskladnost AKID/SKID"
+#~ msgid "AKID/Issuer serial mismatch"
+#~ msgstr "Neskladnost AKID/zaporedne Å¡tevilke izdajatelja"
+#~ msgid "Key usage does not support certificate signing"
+#~ msgstr "Uporaba kljuÄ?a ne podpira podpisovanja potrdil"
+#~ msgid "Error in application verification"
+#~ msgstr "Napaka med preverjanjem programa"
+#~ msgid ""
+#~ "Bad certificate from %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Do you wish to accept anyway?"
+#~ msgstr ""
+#~ "Zlonamerno potrdilo %s:\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "%s\n"
+#~ "\n"
+#~ "Ga želite vseeno sprejeti?"
+#~ msgid "Enter password for %s"
+#~ msgstr "Vnesite geslo za %s"
+#~ msgid "Enter password"
+#~ msgstr "Vnesite geslo"
+#~ msgid "Owner"
+#~ msgstr "Lastnik"
+#~ msgid "Publishing Editor"
+#~ msgstr "Urednik objave"
+#~ msgid "Editor"
+#~ msgstr "Urednik"
+#~ msgid "Publishing Author"
+#~ msgstr "Avtor objave"
+#~ msgid "Author"
+#~ msgstr "Avtor"
+#~ msgid "Non-editing Author"
+#~ msgstr "Avtor, ki ne ureja"
+#~ msgid "Reviewer"
+#~ msgstr "Pregledovalec"
+#~ msgid "Contributor"
+#~ msgstr "Sodelavec"
+#~ msgid "None"
+#~ msgstr "brez"
+#~ msgid "Custom"
+#~ msgstr "Po meri"
+#~ msgid "Generic error"
+#~ msgstr "GeneriÄ?na napaka"
+#~ msgid "A folder with the same name already exists"
+#~ msgstr "Mapa z enakim imenom že obstaja"
+#~ msgid "The specified folder type is not valid"
+#~ msgstr "Izbrana vrsta mape ni veljavna"
+#~ msgid "I/O error"
+#~ msgstr "V/I napaka"
+#~ msgid "Not enough space to create the folder"
+#~ msgstr "Ni dovolj prostora za ustvaritev mape"
+#~ msgid "The folder is not empty"
+#~ msgstr "Mapa ni prazna"
+#~ msgid "The specified folder was not found"
+#~ msgstr "Izbrana mapa ni bila najdena"
+#~ msgid "Function not implemented in this storage"
+#~ msgstr "Funkcija ni implementirana v tem hranilniku"
+#~ msgid "Operation not supported"
+#~ msgstr "Opravilo ni podprto"
+#~ msgid "The specified type is not supported in this storage"
+#~ msgstr "Izbrana vrsta ni podprta v tem hranilniku"
+#~ msgid "The specified folder cannot be modified or removed"
+#~ msgstr "Izbrane mape ni mogoÄ?e spremeniti ali odstraniti"
+#~ msgid "Cannot make a folder a child of one of its descendants"
+#~ msgstr "Ni mogoÄ?e doloÄ?iti mape kot podrejene."
+#~ msgid "Cannot create a folder with that name"
+#~ msgstr "Ni mogoÄ?e ustvariti mape s takÅ¡nim imenom"
+#~ msgid "This operation cannot be performed in off-line mode"
+#~ msgstr "Opravila ni mogoÄ?e izvesti v naÄ?inu brez povezave"
+#~ msgid "%s's Folders"
+#~ msgstr "Mape osebe %s"
+#~ msgid "Personal Folders"
+#~ msgstr "Osebne mape"
+#~ msgid "Favorite Public Folders"
+#~ msgstr "Priljubljene javne mape"
+#~ msgid "All Public Folders"
+#~ msgstr "Vse javne mape"
+#~ msgid "Global Address List"
+#~ msgstr "Globalni seznam naslovov"
+#~ msgid "Deleted Items"
+#~ msgstr "Zbrisani predmeti"
+#~ msgid "Drafts"
+#~ msgstr "Osnutki"
+#~ msgid "Journal"
+#~ msgstr "Dnevnik"
+#~ msgid "Notes"
+#~ msgstr "Opombe"
+#~ msgid "Outbox"
+#~ msgstr "Odhodna pošta"
+#~ msgid "Sent Items"
+#~ msgstr "Poslano"
+#~ msgid "Tasks"
+#~ msgstr "Naloge"
+#~ msgid "Evolution Addressbook file backend"
+#~ msgstr "Hrbtenica imenika Evolution"
+#~ msgid "Evolution Calendar file and webcal backend"
+#~ msgstr "Hrbtni del datoteke Evolution Calendar in webcala"
+#~ msgid "Evolution Data Server interface check service"
+#~ msgstr "Storitev za preverjanje vmesnika Evolution Data Server"
+#~ msgid "Evolution Data Server logging service"
+#~ msgstr "Dnevniška storitev Evolution Data Server"
 #~ msgid "Decoder failed, error %d"
 #~ msgstr "Dešifrirniku ni uspelo. Napaka %d"
 #~ msgid "CRL not yet valid"