[balsa] Added Slovenian translation



commit 2f00806750736b19a4dc5e607a8c0fafbfbcc6a4
Author: Matej Urbančič <mateju svn gnome org>
Date:   Wed Jun 17 15:04:48 2020 +0200

    Added Slovenian translation

 po/sl.po | 6297 +++++++++++++++++++++++++++++++++++++-------------------------
 1 file changed, 3750 insertions(+), 2547 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 4e293c5d9..8f912a117 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,14 +5,14 @@
 # Andraž Tori <andraz tori1 guest arnes si>, 2002.
 # Tadej Janež <tadej_janez email si>, 2003.
 # Andrej Žnidaršič <andrej znidarsic gmail com>, 2010.
-# Matej Urbančič <mateju svn gnome org>, 2006–2017.
+# Matej Urbančič <mateju svn gnome org>, 2006–2020.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: balsa master\n"
 "Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/balsa/issues\n";
-"POT-Creation-Date: 2017-07-28 08:56+0200\n"
-"PO-Revision-Date: 2017-07-28 08:57+0200\n"
+"POT-Creation-Date: 2020-06-16 23:50+0000\n"
+"PO-Revision-Date: 2020-06-17 13:25+0200\n"
 "Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenščina <gnome-si googlegroups com>\n"
 "Language: sl_SI\n"
@@ -22,180 +22,303 @@ msgstr ""
 "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
 "%100==4 ? 3 : 0);\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Generator: Poedit 2.0.1\n"
+"X-Generator: Poedit 2.3\n"
 
-#: ../balsa.desktop.in.in.h:1 ../balsa-mailto-handler.desktop.in.in.h:1
+#: ../balsa.appdata.xml.in.h:1
+msgid ""
+"Balsa is a graphical mail client. While it is in active development, Balsa "
+"has many features such as:"
+msgstr ""
+"Balsa je grafični odjemalec za elektronsko pošto s stalnim razvojem in "
+"pestrim naborom zmožnosti:"
+
+#: ../balsa.appdata.xml.in.h:2
+msgid "IMAP and POP3 support;"
+msgstr "podpora za IMAP in POP3,"
+
+#: ../balsa.appdata.xml.in.h:3
+msgid "sendmail or direct SMTP support;"
+msgstr "podpora za sendmail in SMTP,"
+
+#: ../balsa.appdata.xml.in.h:4
+msgid "optional multi-threaded retrieval and sending of messages;"
+msgstr "izbirno več-nitno pridobivanje in pošiljanje sporočil,"
+
+#: ../balsa.appdata.xml.in.h:5
+msgid "support for all configurations of local mail folders;"
+msgstr "podpora za različne nastavitve krajevnih map,"
+
+#: ../balsa.appdata.xml.in.h:6
+msgid "automatic mail checking;"
+msgstr "samodejno preverjanje pošte,"
+
+#: ../balsa.appdata.xml.in.h:7
+#, fuzzy
+#| msgid "Mail options"
+msgid "mail printing;"
+msgstr "Možnosti pošte"
+
+#: ../balsa.appdata.xml.in.h:8
+msgid "inline attachment viewing;"
+msgstr "pregledovanje prilog znotraj sporočila in"
+
+#: ../balsa.appdata.xml.in.h:9
+msgid "and the proverbial much, much more."
+msgstr "in še veliko veliko več."
+
+#: ../org.desktop.Balsa.desktop.in.in.h:1
+#: ../balsa-mailto-handler.desktop.in.in.h:1
 msgid "Balsa"
 msgstr "Balsa"
 
-#: ../balsa.desktop.in.in.h:2 ../balsa-mailto-handler.desktop.in.in.h:2
-#, fuzzy
-#| msgid "E-Mail utility"
+#: ../org.desktop.Balsa.desktop.in.in.h:2
+#: ../balsa-mailto-handler.desktop.in.in.h:2
 msgid "Email utility"
-msgstr "Pripomoček"
+msgstr "Elektronska pošta"
 
-#: ../balsa.desktop.in.in.h:3 ../balsa-mailto-handler.desktop.in.in.h:3
+#: ../org.desktop.Balsa.desktop.in.in.h:3
+#: ../balsa-mailto-handler.desktop.in.in.h:3
 msgid "Mail Client"
 msgstr "Odjemalec elektronske pošte"
 
-#: ../balsa.desktop.in.in.h:4 ../balsa-mailto-handler.desktop.in.in.h:4
+#: ../org.desktop.Balsa.desktop.in.in.h:4
+#: ../balsa-mailto-handler.desktop.in.in.h:4
 msgid "Balsa Mail Client"
 msgstr "Odjemalec elektronske pošte Balsa"
 
-#: ../libbalsa/address-book.c:312 ../libbalsa/filter-error.c:45
+#: ../libbalsa/address-book.c:299 ../libbalsa/filter-error.c:45
 msgid "No error"
 msgstr "Brez napake"
 
-#: ../libbalsa/address-book.c:313
+#: ../libbalsa/address-book.c:300
 msgid "Cannot read from address book"
 msgstr "Ni mogoče brati iz imenika"
 
-#: ../libbalsa/address-book.c:314
+#: ../libbalsa/address-book.c:301
 msgid "Cannot write to address book"
 msgstr "Ni mogoče pisati v imenik"
 
-#: ../libbalsa/address-book.c:315
+#: ../libbalsa/address-book.c:302
 msgid "Cannot connect to the server"
 msgstr "Povezava s strežnikom ni mogoča"
 
-#: ../libbalsa/address-book.c:316
+#: ../libbalsa/address-book.c:303
 msgid "Cannot search in the address book"
 msgstr "Ni mogoče iskati v imeniku"
 
-#: ../libbalsa/address-book.c:318
+#: ../libbalsa/address-book.c:305
 msgid "Cannot add duplicate entry"
 msgstr "Ni mogoče dodati dvojnega vnosa"
 
-#: ../libbalsa/address-book.c:320
+#: ../libbalsa/address-book.c:307
 msgid "Cannot find address in address book"
 msgstr "Ni mogoče najti naslova v imeniku"
 
-#: ../libbalsa/address-book.c:321 ../src/main-window.c:2922
-#: ../src/main-window.c:4226 ../src/sendmsg-window.c:3820
+#: ../libbalsa/address-book.c:308 ../src/main-window.c:2969
+#: ../src/main-window.c:4092 ../src/sendmsg-window.c:3895
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#. The externq database doesn't support Id's, sorry!
-#: ../libbalsa/address-book-extern.c:209 ../libbalsa/address-book-ldif.c:233
+#. The extern database doesn't support Id's, sorry!
+#: ../libbalsa/address-book-extern.c:189 ../libbalsa/address-book-ldif.c:243
 msgid "No-Id"
 msgstr "Brez-ID"
 
-#: ../libbalsa/address-book-extern.c:214 ../libbalsa/address-book-extern.c:372
-#: ../libbalsa/address-book-ldap.c:497 ../libbalsa/address-book-ldif.c:212
-#: ../libbalsa/address-book-ldif.c:236 ../libbalsa/address-book-ldif.c:255
-#: ../libbalsa/address-book-ldif.c:259 ../libbalsa/address-book-vcard.c:158
-#: ../libbalsa/address-book-vcard.c:256 ../libbalsa/address.c:404
+#: ../libbalsa/address-book-extern.c:191 ../libbalsa/address-book-extern.c:349
+#: ../libbalsa/address-book-ldap.c:550 ../libbalsa/address-book-ldif.c:189
+#: ../libbalsa/address-book-ldif.c:227 ../libbalsa/address-book-ldif.c:270
+#: ../libbalsa/address-book-ldif.c:274 ../libbalsa/address-book-vcard.c:142
+#: ../libbalsa/address-book-vcard.c:249 ../libbalsa/address.c:409
 #: ../libbalsa/rfc6350.c:112
 msgid "No-Name"
 msgstr "Brez imena"
 
-#: ../libbalsa/address-book-ldap.c:280
-msgid "SASL Interaction\n"
-msgstr "Delovanje SASL\n"
+#. very unlikely...
+#: ../libbalsa/address-book-ldap.c:333
+msgid "Host not found"
+msgstr "Gostitelja ni mogoče najti"
+
+#: ../libbalsa/address-book-ldap.c:345
+#, c-format
+msgid "The LDAP server “%s” does not support LDAPv3, interaction may fail."
+msgstr ""
 
-#: ../libbalsa/address-book-ldap.c:327
+#: ../libbalsa/address-book-ldap.c:370
 msgid "TLS requested but not compiled in"
 msgstr "TLS je bil zahtevan, vendar ni kodno preveden"
 
-#: ../libbalsa/address-book-ldap.c:606
+#: ../libbalsa/address-book-ldap.c:666
 msgid "Undefined location of user address book"
 msgstr "Nedoločeno mesto imenika uporabnikov"
 
-#: ../libbalsa/address-book-osmo.c:146
-#, fuzzy, c-format
-#| msgid "Removing duplicates failed: %s"
+#: ../libbalsa/address-book-ldap.c:1097
+#, c-format
+msgid "LDAP server %s down, next attempt will try to reconnect."
+msgstr ""
+
+#: ../libbalsa/address-book-osmo.c:155
+#, c-format
 msgid "Reading Osmo contacts failed: %s"
-msgstr "Napaka med branjem odgovora posredniškega strežnika: %s\n"
+msgstr "Branje stikov Osmo je spodletelo: %s"
 
-#: ../libbalsa/address.c:952
+#: ../libbalsa/address.c:974
 msgid "D_isplayed Name:"
 msgstr "P_rikazano ime:"
 
-#: ../libbalsa/address.c:953
+#: ../libbalsa/address.c:975
 msgid "_First Name:"
 msgstr "_Ime:"
 
-#: ../libbalsa/address.c:954
+#: ../libbalsa/address.c:976
 msgid "_Last Name:"
 msgstr "_Priimek:"
 
-#: ../libbalsa/address.c:955
+#: ../libbalsa/address.c:977
 msgid "_Nickname:"
 msgstr "_Vzdevek:"
 
-#: ../libbalsa/address.c:956
+#: ../libbalsa/address.c:978
 msgid "O_rganization:"
-msgstr "_Organizacija:"
+msgstr "_Ustanova:"
 
-#: ../libbalsa/address.c:957
+#: ../libbalsa/address.c:979
 msgid "_Email Address:"
 msgstr "_Elektronski naslov:"
 
-#: ../libbalsa/address.c:976 ../src/filter-edit-callbacks.c:1077
+#: ../libbalsa/address.c:1000 ../src/filter-edit-callbacks.c:1068
 msgid "A_dd"
 msgstr "_Dodaj"
 
-#: ../libbalsa/address-view.c:160 ../src/balsa-mime-widget-message.c:747
-#: ../src/balsa-print-object-header.c:171 ../src/sendmsg-window.c:717
-#: ../src/sendmsg-window.c:3527
+#: ../libbalsa/address-view.c:156 ../src/balsa-mime-widget-message.c:757
+#: ../src/balsa-print-object-header.c:146 ../src/sendmsg-window.c:682
+#: ../src/sendmsg-window.c:3590
 msgid "To:"
 msgstr "Za:"
 
-#: ../libbalsa/address-view.c:161 ../src/balsa-mime-widget-message.c:749
-#: ../src/balsa-print-object-header.c:173 ../src/sendmsg-window.c:717
-#: ../src/sendmsg-window.c:3535
+#: ../libbalsa/address-view.c:157 ../src/balsa-mime-widget-message.c:759
+#: ../src/balsa-print-object-header.c:148 ../src/sendmsg-window.c:682
+#: ../src/sendmsg-window.c:3598
 msgid "CC:"
 msgstr "Kp:"
 
-#: ../libbalsa/address-view.c:162 ../src/balsa-mime-widget-message.c:751
-#: ../src/balsa-print-object-header.c:175 ../src/sendmsg-window.c:717
+#: ../libbalsa/address-view.c:158 ../src/balsa-mime-widget-message.c:761
+#: ../src/balsa-print-object-header.c:150 ../src/sendmsg-window.c:682
 msgid "BCC:"
 msgstr "Skp:"
 
-#: ../libbalsa/address-view.c:163
+#: ../libbalsa/address-view.c:159
 msgid "Reply To:"
 msgstr "Odgovori na:"
 
-#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1841
-#: ../libbalsa/message.c:846
+#: ../libbalsa/autocrypt.c:181
+#, fuzzy, c-format
+#| msgid "Could not write file %s: %s"
+msgid "cannot initialise Autocrypt database “%s”: %s"
+msgstr "Datoteka PO »%s« ne obstaja ali pa je ni mogoče prebrati."
+
+#: ../libbalsa/autocrypt.c:307
+#, c-format
+msgid ""
+"No usable private key for “%s” found! Please create a key or disable "
+"Autocrypt."
+msgstr ""
+
+#: ../libbalsa/autocrypt.c:374 ../libbalsa/autocrypt.c:382
+#: ../libbalsa/autocrypt.c:651 ../libbalsa/autocrypt.c:657
+#, fuzzy, c-format
+#| msgid "Error executing signature generator “%s”: %s"
+msgid "error reading Autocrypt data for “%s”: %s"
+msgstr "Napaka izvajanja ustvarjalnika podpisa »%s«: %s"
+
+#: ../libbalsa/autocrypt.c:435
+msgid "Autocrypt database"
+msgstr ""
+
+#: ../libbalsa/autocrypt.c:436 ../libbalsa/html.c:424
+#: ../libbalsa/identity.c:1658 ../libbalsa/libbalsa-gpgme-widgets.c:765
+#: ../src/ab-window.c:148 ../src/folder-conf.c:337 ../src/mailbox-node.c:1052
+#: ../src/main-window.c:3784 ../src/toolbar-prefs.c:130
+#: ../ui/main-window.ui.h:65 ../ui/message-window.ui.h:4
+#: ../ui/sendmsg-window.ui.h:12 ../ui/source-viewer.ui.h:2
+msgid "_Close"
+msgstr "_Zapri"
+
+#: ../libbalsa/autocrypt.c:442 ../libbalsa/libbalsa-gpgme-cb.c:221
+msgid "Double-click key to show details"
+msgstr ""
+
+#: ../libbalsa/autocrypt.c:497 ../src/balsa-mblist.c:326
+msgid "Mailbox"
+msgstr "Poštni predal"
+
+#: ../libbalsa/autocrypt.c:502
+msgid "Last seen"
+msgstr "Zadnjič videno"
+
+#: ../libbalsa/autocrypt.c:507
+#, fuzzy
+#| msgid "Cannot create message"
+msgid "Last Autocrypt message"
+msgstr "Ni mogoče ustvariti sporočila"
+
+#: ../libbalsa/autocrypt.c:512
+#, fuzzy
+#| msgid "Prefere_nces"
+msgid "Prefer encryption"
+msgstr "Mož_nosti"
+
+#: ../libbalsa/autocrypt.c:745 ../libbalsa/autocrypt.c:765
+#, fuzzy, c-format
+#| msgid "part %s: %s (file %s)"
+msgid "update user “%s” failed: %s"
+msgstr "del %s: %s (datoteka %s)"
+
+#: ../libbalsa/autocrypt.c:745
+#, fuzzy, c-format
+#| msgid "Saving sent message to %s failed: %s"
+msgid "insert user “%s” failed: %s"
+msgstr "Shranjevanje poslanega sporočila v %s ni uspelo: %s"
+
+#: ../libbalsa/body.c:119 ../libbalsa/mailbox_local.c:1878
+#: ../libbalsa/message.c:941 ../libbalsa/message.c:958
 msgid "(No subject)"
 msgstr "(brez zadeve)"
 
-#: ../libbalsa/body.c:389 ../libbalsa/body.c:436
+#: ../libbalsa/body.c:392 ../libbalsa/body.c:439
 #, c-format
 msgid "Failed to create output stream"
 msgstr "Ustvarjanje izhodnega pretoka je spodletelo"
 
-#: ../libbalsa/body.c:568
+#: ../libbalsa/body.c:576
 #, c-format
 msgid "Could not read embedded message"
 msgstr "Vključenega sporočila ni mogoče prebrati"
 
-#: ../libbalsa/filter.c:125 ../libbalsa/mailbox_local.c:871
+#: ../libbalsa/filter.c:127 ../libbalsa/mailbox_local.c:875
 msgid "Unable to load message body to match filter"
 msgstr "Ni mogoče naložiti telesa sporočila, ki bi se skladalo s filtrom"
 
-#: ../libbalsa/filter.c:232
+#: ../libbalsa/filter.c:225
 #, c-format
 msgid "Invalid filter: %s"
 msgstr "Neveljaven filter: %s"
 
-#: ../libbalsa/filter.c:280 ../libbalsa/filter.c:303
+#: ../libbalsa/filter.c:273 ../libbalsa/filter.c:296
 #, c-format
 msgid "Bad mailbox name for filter: %s"
 msgstr "Slabo ime poštnega predala za filter: %s"
 
-#: ../libbalsa/filter.c:284
+#: ../libbalsa/filter.c:277
 #, c-format
 msgid "Error when copying messages: %s"
 msgstr "Napaka med kopiranjem sporočil: %s"
 
-#: ../libbalsa/filter.c:294
+#: ../libbalsa/filter.c:287
 #, c-format
 msgid "Error when trashing messages: %s"
 msgstr "Napaka med premikanjem sporočil v smeti: %s"
 
-#: ../libbalsa/filter.c:307
+#: ../libbalsa/filter.c:300
 #, c-format
 msgid "Error when moving messages: %s"
 msgstr "Napaka med premikanjem sporočil: %s"
@@ -216,22 +339,22 @@ msgstr "Napaka skladnje logičnega izraza"
 msgid "Attempt to apply an invalid filter"
 msgstr "Poskus uveljavitve neveljavnega filtra"
 
-#: ../libbalsa/filter-file.c:133
+#: ../libbalsa/filter-file.c:138
 #, c-format
 msgid "Invalid filters %s for mailbox %s"
 msgstr "Neveljavni filtri %s za poštni predal %s"
 
 #. FIXME: this is hack!
-#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:983
+#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:1012
 msgid "To"
 msgstr "Za"
 
-#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:351
+#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:380
 msgid "From"
 msgstr "Od"
 
-#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:367
-#: ../src/pref-manager.c:218
+#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:396
+#: ../src/pref-manager.c:217
 msgid "Subject"
 msgstr "Zadeva"
 
@@ -252,15 +375,15 @@ msgstr "Glava:%s"
 msgid "New"
 msgstr "Novo"
 
-#: ../libbalsa/filter-funcs.c:413 ../src/filter-edit-callbacks.c:1000
+#: ../libbalsa/filter-funcs.c:413 ../src/filter-edit-callbacks.c:991
 msgid "Deleted"
 msgstr "Izbrisano"
 
-#: ../libbalsa/filter-funcs.c:414 ../src/filter-edit-callbacks.c:1000
+#: ../libbalsa/filter-funcs.c:414 ../src/filter-edit-callbacks.c:991
 msgid "Replied"
 msgstr "Odgovorjeno"
 
-#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:1000
+#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:991
 msgid "Flagged"
 msgstr "Z zastavico"
 
@@ -284,24 +407,89 @@ msgstr "IN"
 msgid "Or"
 msgstr "ALI"
 
-#: ../libbalsa/gmime-application-pkcs7.c:123
+#: ../libbalsa/folder-scanners.c:507
+#, fuzzy, c-format
+#| msgid "could not set protocol '%s'"
+msgid "Could not connect to “%s”"
+msgstr "Ni mogoče določiti protokola za naslov URI %s"
+
+#: ../libbalsa/gmime-application-pkcs7.c:121
 #, c-format
 msgid "Failed to decrypt MIME part: parse error"
 msgstr "Napaka med dešifriranjem dela MIME: napaka razčlenitve"
 
-#: ../libbalsa/gmime-multipart-crypt.c:220
+#: ../libbalsa/gmime-gpgme-signature.c:147
+#: ../libbalsa/libbalsa-gpgme-widgets.c:357
+#: ../libbalsa/libbalsa-gpgme-widgets.c:670 ../libbalsa/rfc3156.c:693
+#: ../src/address-book-config.c:200
+msgid "never"
+msgstr "nikoli"
+
+#: ../libbalsa/gmime-gpgme-signature.c:166
+#, fuzzy, c-format
+#| msgid "Cannot read signature file “%s”: %s"
+msgid "%s signature of “%s”: %s"
+msgstr "Datoteke podpisa »%s« ni mogoče prebrati: %s"
+
+#: ../libbalsa/gmime-gpgme-signature.c:170
+#, fuzzy, c-format
+#| msgid "PGP signature: "
+msgid "%s signature: %s"
+msgstr "Podpis PGP: "
+
+#: ../libbalsa/gmime-gpgme-signature.c:188
+#, fuzzy, c-format
+#| msgid "PGP signature: "
+msgid " signature: %s"
+msgstr "Podpis PGP: "
+
+#: ../libbalsa/gmime-gpgme-signature.c:192
+#, c-format
+msgid ""
+"\n"
+"Signature validity: %s"
+msgstr ""
+"\n"
+"Veljavnost podpisa: %s"
+
+#: ../libbalsa/gmime-gpgme-signature.c:195
+#, c-format
+msgid ""
+"\n"
+"Signed on: %s"
+msgstr ""
+"\n"
+"Podpisano ob: %s"
+
+#: ../libbalsa/gmime-gpgme-signature.c:199
+#, c-format
+msgid ""
+"\n"
+"Key fingerprint: %s"
+msgstr ""
+"\n"
+"Prstni odtis ključa: %s"
+
+#: ../libbalsa/gmime-gpgme-signature.c:237 ../libbalsa/imap/imap-handle.c:46
+#: ../libbalsa/libbalsa-gpgme.c:190 ../libbalsa/rfc2445.c:415
+#: ../libbalsa/rfc2445.c:444 ../libbalsa/rfc2445.c:467
+#: ../libbalsa/rfc2445.c:1120 ../libbalsa/rfc3156.c:689
+#: ../src/folder-conf.c:411 ../src/sendmsg-window.c:5318
+msgid "unknown"
+msgstr "neznan"
+
+#: ../libbalsa/gmime-multipart-crypt.c:230
 msgid "Cannot verify multipart/signed part due to missing subparts."
 msgstr ""
 "Ni mogoče overiti dela večdelnega predmeta zaradi manjkajočih podrejenih "
 "delov."
 
-#: ../libbalsa/gmime-multipart-crypt.c:244
-#, fuzzy, c-format
-#| msgid "unsupported protocol '%s'"
+#: ../libbalsa/gmime-multipart-crypt.c:254
+#, c-format
 msgid "unsupported protocol “%s”"
-msgstr "Nepodprt protokol »%s«"
+msgstr "nepodprt protokol »%s«"
 
-#: ../libbalsa/gmime-multipart-crypt.c:257
+#: ../libbalsa/gmime-multipart-crypt.c:267
 msgid ""
 "Cannot verify multipart/signed part: signature content-type does not match "
 "protocol."
@@ -309,7 +497,7 @@ msgstr ""
 "Ni mogoče overiti dela večdelnega predmeta: vrsta vsebine podpisa ni skladna "
 "s protokolom."
 
-#: ../libbalsa/gmime-multipart-crypt.c:453
+#: ../libbalsa/gmime-multipart-crypt.c:463
 #, c-format
 msgid ""
 "Cannot decrypt multipart/encrypted part: unsupported encryption protocol "
@@ -318,11 +506,11 @@ msgstr ""
 "Ni mogoče odšifrirati dela večdelnega predmeta: nepodprt protokol šifriranja "
 "»%s«."
 
-#: ../libbalsa/gmime-multipart-crypt.c:454
+#: ../libbalsa/gmime-multipart-crypt.c:464
 msgid "(none)"
 msgstr "(brez)"
 
-#: ../libbalsa/gmime-multipart-crypt.c:467
+#: ../libbalsa/gmime-multipart-crypt.c:477
 msgid ""
 "Cannot decrypt multipart/encrypted part: content-type does not match "
 "protocol."
@@ -330,30 +518,29 @@ msgstr ""
 "Ni mogoče odšifrirati dela večdelnega predmeta: vrsta vsebine ni skladna s "
 "protokolom."
 
-#: ../libbalsa/gmime-multipart-crypt.c:482
+#: ../libbalsa/gmime-multipart-crypt.c:492
 msgid "Cannot decrypt multipart/encrypted part: unexpected content type"
 msgstr ""
 "Ni mogoče odšifrirati dela večdelnega predmeta: nepričakovana vrsta vsebine."
 
-#: ../libbalsa/gmime-multipart-crypt.c:524
+#: ../libbalsa/gmime-multipart-crypt.c:534
 msgid ""
 "Cannot decrypt multipart/encrypted part: failed to parse decrypted content"
 msgstr ""
 "Ni mogoče odšifrirati dela večdelnega predmeta: razčlenjevanje šifrirane "
 "vsebine je spodletelo."
 
-#: ../libbalsa/html.c:66
+#: ../libbalsa/html.c:76
 #, c-format
 msgid "Could not get an HTML part: %s"
 msgstr "Ni mogoče dobiti dela HTML: %s"
 
-#: ../libbalsa/html.c:119
-#, fuzzy, c-format
-#| msgid "Could not get an HTML part: %s"
+#: ../libbalsa/html.c:134
+#, c-format
 msgid "Could not convert HTML part to text: %s"
-msgstr "Ni mogoče shraniti besedilnega dela: %s"
+msgstr "Ni mogoče pretvoriti HTML v neoblikovano besedilo: %s"
 
-#: ../libbalsa/html.c:400
+#: ../libbalsa/html.c:405
 #, fuzzy
 #| msgid ""
 #| "This message part contains images from a remote server. To protect your "
@@ -368,7 +555,7 @@ msgstr ""
 "zasebnosti niso bile prenesene. V primeru da zaupate strežniku, lahko "
 "izberete njihov prejem."
 
-#: ../libbalsa/html.c:408 ../libbalsa/html.c:1076
+#: ../libbalsa/html.c:413
 msgid ""
 "This message part contains images from a remote server. To protect your "
 "privacy, Balsa has not downloaded them. You may choose to download them if "
@@ -378,316 +565,417 @@ msgstr ""
 "zasebnosti niso bile prenesene. V primeru da zaupate strežniku, lahko "
 "izberete njihov prejem."
 
-#: ../libbalsa/html.c:417 ../libbalsa/html.c:1087
+#: ../libbalsa/html.c:422
 msgid "_Download images"
 msgstr "_Prejmi slike"
 
-#: ../libbalsa/html.c:419 ../libbalsa/html.c:1089 ../libbalsa/identity.c:1702
-#: ../src/ab-window.c:148 ../src/mailbox-node.c:1113 ../src/main-window.c:3911
-#: ../src/toolbar-prefs.c:140
-msgid "_Close"
-msgstr "_Zapri"
-
 #. should "re" be localized ?
-#: ../libbalsa/identity.c:99 ../libbalsa/mailbox_local.c:1964
-#: ../libbalsa/mailbox_local.c:1966 ../src/sendmsg-window.c:3768
-#: ../src/sendmsg-window.c:3770
+#: ../libbalsa/identity.c:109 ../libbalsa/mailbox_local.c:2001
+#: ../libbalsa/mailbox_local.c:2003 ../src/sendmsg-window.c:3843
+#: ../src/sendmsg-window.c:3845
 msgid "Re:"
 msgstr "Od:"
 
 # Naj se ta niz prevaja ali ne ??
-#: ../libbalsa/identity.c:100 ../src/sendmsg-window.c:3708
-#: ../src/sendmsg-window.c:3709 ../src/sendmsg-window.c:3710
+#: ../libbalsa/identity.c:110 ../src/sendmsg-window.c:3782
+#: ../src/sendmsg-window.c:3783 ../src/sendmsg-window.c:3784
 msgid "Fwd:"
 msgstr "Pos:"
 
-#: ../libbalsa/identity.c:160
+#: ../libbalsa/identity.c:175
 msgid "New Identity"
 msgstr "Nova istovetnost"
 
-#: ../libbalsa/identity.c:337
+#: ../libbalsa/identity.c:235
 #, fuzzy, c-format
-#| msgid "Error executing signature generator %s"
+#| msgid "Error executing signature generator “%s”: %s"
+msgid "Error executing signature generator “%s”: "
+msgstr "Napaka izvajanja ustvarjalnika podpisa »%s«: %s"
+
+#: ../libbalsa/identity.c:239
+#, c-format
 msgid "Error executing signature generator “%s”: %s"
-msgstr "Napaka pri izvajanju ukaza: %s."
+msgstr "Napaka izvajanja ustvarjalnika podpisa »%s«: %s"
 
-#: ../libbalsa/identity.c:346
+#: ../libbalsa/identity.c:245
 #, fuzzy, c-format
-#| msgid "Cannot open signature file '%s' for reading"
-msgid "Cannot read signature file “%s”: %s"
-msgstr "Datoteka PO '%s' ne obstaja ali pa je ni mogoče prebrati."
+#| msgid "Cannot read signature file “%s”: %s"
+msgid "Cannot read signature file “%s”: "
+msgstr "Datoteke podpisa »%s« ni mogoče prebrati: %s"
 
-#: ../libbalsa/identity.c:357
-#, c-format
-msgid "Signature in %s is not a UTF-8 text."
+#: ../libbalsa/identity.c:256
+#, fuzzy, c-format
+#| msgid "Signature in %s is not a UTF-8 text."
+msgid "Signature in “%s” is not a UTF-8 text."
 msgstr "Podpis v %s ni besedilo UTF-8."
 
-#: ../libbalsa/identity.c:468 ../libbalsa/libbalsa-gpgme-cb.c:158
-#: ../libbalsa/libbalsa-gpgme-cb.c:359 ../libbalsa/smtp-server.c:472
-#: ../src/ab-main.c:858 ../src/ab-window.c:141 ../src/address-book-config.c:237
-#: ../src/address-book-config.c:342 ../src/address-book-config.c:388
-#: ../src/balsa-app.c:89 ../src/balsa-index.c:2657 ../src/balsa-mblist.c:1895
-#: ../src/balsa-message.c:1766 ../src/balsa-mime-widget-callbacks.c:85
-#: ../src/filter-edit-callbacks.c:1247 ../src/filter-edit-dialog.c:402
-#: ../src/filter-edit-dialog.c:571 ../src/filter-export-dialog.c:79
-#: ../src/filter-run-dialog.c:316 ../src/folder-conf.c:311
-#: ../src/folder-conf.c:573 ../src/folder-conf.c:806 ../src/mailbox-conf.c:462
-#: ../src/mailbox-conf.c:483 ../src/mailbox-conf.c:499
-#: ../src/mailbox-conf.c:1222 ../src/mailbox-conf.c:1259
-#: ../src/pref-manager.c:3298 ../src/sendmsg-window.c:532
-#: ../src/sendmsg-window.c:1557 ../src/sendmsg-window.c:2009
-#: ../src/sendmsg-window.c:3334 ../src/sendmsg-window.c:4697
-#: ../src/sendmsg-window.c:4994 ../src/sendmsg-window.c:5151
-#: ../src/spell-check.c:382 ../src/store-address.c:208
+#: ../libbalsa/identity.c:368 ../libbalsa/libbalsa-gpgme-cb.c:182
+#: ../libbalsa/libbalsa-gpgme-cb.c:338 ../libbalsa/smtp-server.c:327
+#: ../src/ab-main.c:850 ../src/ab-window.c:141 ../src/address-book-config.c:240
+#: ../src/address-book-config.c:346 ../src/address-book-config.c:392
+#: ../src/balsa-app.c:94 ../src/balsa-app.c:163 ../src/balsa-index.c:2674
+#: ../src/balsa-mblist.c:1890 ../src/balsa-message.c:1741
+#: ../src/balsa-mime-widget-callbacks.c:85 ../src/filter-edit-callbacks.c:1238
+#: ../src/filter-edit-dialog.c:404 ../src/filter-edit-dialog.c:574
+#: ../src/filter-export-dialog.c:80 ../src/filter-run-dialog.c:300
+#: ../src/folder-conf.c:343 ../src/folder-conf.c:469 ../src/folder-conf.c:842
+#: ../src/folder-conf.c:1090 ../src/mailbox-conf.c:207
+#: ../src/mailbox-conf.c:229 ../src/mailbox-conf.c:245
+#: ../src/mailbox-conf.c:733 ../src/mailbox-conf.c:790
+#: ../src/pref-manager.c:3260 ../src/sendmsg-window.c:494
+#: ../src/sendmsg-window.c:1505 ../src/sendmsg-window.c:1965
+#: ../src/sendmsg-window.c:3348 ../src/sendmsg-window.c:4784
+#: ../src/sendmsg-window.c:5087 ../src/sendmsg-window.c:5173
+#: ../src/spell-check.c:395 ../src/store-address.c:208
 msgid "_Cancel"
 msgstr "_Prekliči"
 
-#: ../libbalsa/identity.c:469 ../libbalsa/libbalsa-gpgme-cb.c:157
-#: ../libbalsa/libbalsa-gpgme-cb.c:358 ../libbalsa/smtp-server.c:471
-#: ../src/ab-window.c:140 ../src/balsa-app.c:88 ../src/balsa-message.c:1767
-#: ../src/balsa-mime-widget-callbacks.c:86 ../src/filter-edit-callbacks.c:1246
-#: ../src/filter-edit-dialog.c:570 ../src/filter-export-dialog.c:78
-#: ../src/filter-run-dialog.c:315 ../src/main-window.c:4006
-#: ../src/pref-manager.c:3296 ../src/sendmsg-window.c:1556
-#: ../src/sendmsg-window.c:2010 ../src/sendmsg-window.c:3333
-#: ../src/sendmsg-window.c:4698 ../src/store-address.c:209
+#: ../libbalsa/identity.c:369 ../libbalsa/libbalsa-gpgme-cb.c:181
+#: ../libbalsa/libbalsa-gpgme-cb.c:337 ../libbalsa/smtp-server.c:326
+#: ../src/ab-window.c:140 ../src/balsa-app.c:95 ../src/balsa-app.c:162
+#: ../src/balsa-message.c:1742 ../src/balsa-mime-widget-callbacks.c:86
+#: ../src/filter-edit-callbacks.c:1237 ../src/filter-edit-dialog.c:573
+#: ../src/filter-export-dialog.c:79 ../src/filter-run-dialog.c:299
+#: ../src/folder-conf.c:344 ../src/main-window.c:3876
+#: ../src/pref-manager.c:3258 ../src/sendmsg-window.c:1504
+#: ../src/sendmsg-window.c:1966 ../src/sendmsg-window.c:3347
+#: ../src/sendmsg-window.c:4785 ../src/store-address.c:209
 msgid "_OK"
 msgstr "_V redu↓"
 
-#: ../libbalsa/identity.c:481
+#: ../libbalsa/identity.c:381
 msgid "Current"
 msgstr "Trenutna"
 
-#: ../libbalsa/identity.c:731 ../libbalsa/smtp-server.c:179
+#: ../libbalsa/identity.c:643 ../libbalsa/smtp-server.c:140
 msgid "Default"
 msgstr "Privzeta"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:933
+#: ../libbalsa/identity.c:837
 msgid "_Face Path"
 msgstr "_Face Pot"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:939
+#: ../libbalsa/identity.c:843
 msgid "_X-Face Path"
 msgstr "_X-Face pot"
 
 #. create the "General" tab
-#: ../libbalsa/identity.c:962
+#: ../libbalsa/identity.c:865
 msgid "General"
 msgstr "Splošno"
 
-#: ../libbalsa/identity.c:964
+#: ../libbalsa/identity.c:867
 msgid "_Identity name:"
 msgstr "Ime _istovetnosti:"
 
-#: ../libbalsa/identity.c:966
+#: ../libbalsa/identity.c:869
 msgid "_Full name:"
 msgstr "Polno _Ime:"
 
-#: ../libbalsa/identity.c:968
+#: ../libbalsa/identity.c:871
 msgid "_Mailing address:"
 msgstr "_Naslov pošiljanja:"
 
-#: ../libbalsa/identity.c:970
+#: ../libbalsa/identity.c:873
 msgid "Reply _to:"
 msgstr "Odgovori_na:"
 
-#: ../libbalsa/identity.c:972
+#: ../libbalsa/identity.c:875
 msgid "_Domain:"
 msgstr "_Domena:"
 
 #. create the "Messages" tab
-#: ../libbalsa/identity.c:976
+#: ../libbalsa/identity.c:879
 msgid "Messages"
 msgstr "Sporočila"
 
-#: ../libbalsa/identity.c:978
+#: ../libbalsa/identity.c:881
 msgid "_BCC:"
 msgstr "_Skp:"
 
-#: ../libbalsa/identity.c:980
+#: ../libbalsa/identity.c:883
 msgid "Reply _string:"
 msgstr "Niz za od_govor:"
 
-#: ../libbalsa/identity.c:982
+#: ../libbalsa/identity.c:885
 msgid "F_orward string:"
 msgstr "Niz za p_osredovanje:"
 
-#: ../libbalsa/identity.c:985
+#: ../libbalsa/identity.c:888
 msgid "send messages in both plain text and _HTML format"
 msgstr "pošlji sporočila v obliki običajnega besedila in _HTML"
 
-#: ../libbalsa/identity.c:988
+#: ../libbalsa/identity.c:891
 msgid "request positive (successful) _Delivery Status Notification by default"
 msgstr ""
 "zahteva je potrjena (uspešno) _Privzeto zahtevaj obvestilo o prejemu "
 "sporočila"
 
-#: ../libbalsa/identity.c:992
+#: ../libbalsa/identity.c:895
 msgid "request _Message Disposition Notification by default"
 msgstr "privzeto zahtevaj obvestilo o _prejemu sporočila"
 
-#: ../libbalsa/identity.c:1001
+#: ../libbalsa/identity.c:904
 msgid "SMT_P server:"
 msgstr "Strežnik SMT_P:"
 
 #. create the "Signature" tab
-#: ../libbalsa/identity.c:1005
+#: ../libbalsa/identity.c:908
 msgid "Signature"
 msgstr "Podpis"
 
-#: ../libbalsa/identity.c:1008
+#: ../libbalsa/identity.c:911
 msgid "Signature _path"
 msgstr "_Pot podpisa"
 
-#: ../libbalsa/identity.c:1011
+#: ../libbalsa/identity.c:914
 msgid "_Execute signature"
 msgstr "I_zvedi podpis"
 
-#: ../libbalsa/identity.c:1014
+#: ../libbalsa/identity.c:917
 msgid "Incl_ude signature"
 msgstr "_Vključi podpis"
 
-#: ../libbalsa/identity.c:1017
+#: ../libbalsa/identity.c:920
 msgid "Include signature when for_warding"
 msgstr "Vključi podpis ob _posredovanju"
 
-#: ../libbalsa/identity.c:1020
+#: ../libbalsa/identity.c:923
 msgid "Include signature when rep_lying"
 msgstr "Vključi podpis ob _odgovarjanju"
 
-#: ../libbalsa/identity.c:1023
+#: ../libbalsa/identity.c:926
 msgid "_Add signature separator"
 msgstr "Dodaj ločni_co podpisa"
 
-#: ../libbalsa/identity.c:1026
+#: ../libbalsa/identity.c:929
 msgid "Prepend si_gnature"
 msgstr "Dodaj podpis na zače_tek"
 
-#: ../libbalsa/identity.c:1032
-#, fuzzy
-#| msgid ""
-#| "Signing and encrypting messages are possible\n"
-#| "only if Balsa is built with cryptographic support."
-msgid ""
-"Signing and encrypting messages are possible only if Balsa is built with "
-"cryptographic support."
-msgstr ""
-"Podpisovanje in šifriranje sporočil je mogoče le v primeru,\n"
-"da je Balsa izgrajena s podporo za šifriranje."
-
-#: ../libbalsa/identity.c:1037
+#: ../libbalsa/identity.c:934
 msgid "Security"
 msgstr "Varnost"
 
-#: ../libbalsa/identity.c:1040
+#: ../libbalsa/identity.c:937
 msgid "sign messages by default"
 msgstr "samodejno podpiši sporočila"
 
-#: ../libbalsa/identity.c:1043
+#: ../libbalsa/identity.c:940
 msgid "encrypt messages by default"
 msgstr "samodejno šifriraj sporočila"
 
-#: ../libbalsa/identity.c:1046
+#: ../libbalsa/identity.c:943
 msgid "default protocol"
 msgstr "privzet protokol"
 
-#: ../libbalsa/identity.c:1049
-msgid "always trust GnuPG keys when encrypting"
+#: ../libbalsa/identity.c:946
+#, fuzzy
+#| msgid "always trust GnuPG keys when encrypting"
+msgid "always trust GnuPG keys to encrypt messages"
 msgstr "med šifriranjem vedno zaupaj ključem GnuPG"
 
-#: ../libbalsa/identity.c:1052
+#: ../libbalsa/identity.c:949
 msgid "remind me if messages can be encrypted"
 msgstr "opomni, če je sporočila mogoče šifrirati"
 
-#: ../libbalsa/identity.c:1055
+#: ../libbalsa/identity.c:952
+#, fuzzy
+#| msgid ""
+#| "use secret key with this id for signing\n"
+#| "(leave empty for automatic selection)"
+msgid ""
+"use secret key with this id for signing GnuPG messages\n"
+"(leave empty for automatic selection)"
+msgstr ""
+"uporabi skrivni ključ s tem ID za podpisovanje\n"
+"(pustite prazno za samodejen izbor)"
+
+#: ../libbalsa/identity.c:956
+#, fuzzy
+#| msgid ""
+#| "use secret key with this id for signing\n"
+#| "(leave empty for automatic selection)"
 msgid ""
-"use secret key with this id for signing\n"
+"use certificate with this id for signing S/MIME messages\n"
 "(leave empty for automatic selection)"
 msgstr ""
 "uporabi skrivni ključ s tem ID za podpisovanje\n"
 "(pustite prazno za samodejen izbor)"
 
-#: ../libbalsa/identity.c:1189
+#: ../libbalsa/identity.c:961
+msgid "Autocrypt mode"
+msgstr "Samošifrirni način"
+
+#: ../libbalsa/identity.c:1079
+#, fuzzy, c-format
+#| msgid "Error loading Face: %s"
+msgid "Error selecting key: %s"
+msgstr "Napaka med nalaganjem Face: %s"
+
+#: ../libbalsa/identity.c:1101
+msgid "Choose…"
+msgstr "Izbor …"
+
+#: ../libbalsa/identity.c:1146
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Napaka med branjem datoteke %s: %s"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1199
+#: ../libbalsa/identity.c:1156
 #, c-format
 msgid "Face header file %s is too long (%lu bytes)."
 msgstr "Face datoteka glave %s je predolga (%lu bajtov)."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1209
+#: ../libbalsa/identity.c:1166
 #, c-format
 msgid "Face header file %s contains binary data."
 msgstr "Face datoteka glave %s vsebuje dvojiške podatke."
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1229 ../src/balsa-message.c:1591
+#: ../libbalsa/identity.c:1186 ../src/balsa-message.c:1568
 #, c-format
 msgid "Error loading Face: %s"
 msgstr "Napaka med nalaganjem Face: %s"
 
-#: ../libbalsa/identity.c:1408
+#: ../libbalsa/identity.c:1365
 msgid "Error: The identity does not have a name"
 msgstr "Napaka: istovetnost nima imena"
 
-#: ../libbalsa/identity.c:1418
+#: ../libbalsa/identity.c:1375
 msgid "Error: An identity with that name already exists"
 msgstr "Napaka: istovetnost s tem imenom že obstaja"
 
-#: ../libbalsa/identity.c:1611
+#: ../libbalsa/identity.c:1573
 msgid "Do you really want to delete the selected identity?"
 msgstr "Ali zares želite izbrisati izbrano istovetnost?"
 
-#: ../libbalsa/identity.c:1656
-#, c-format
-msgid "Error displaying help for identities: %s\n"
+#: ../libbalsa/identity.c:1611
+#, fuzzy, c-format
+#| msgid "Error displaying help for identities: %s\n"
+msgid "Error displaying help for identities: %s"
 msgstr "Napaka med prikazovanjem pomoči za istovetnosti: %s\n"
 
-#: ../libbalsa/identity.c:1695
+#: ../libbalsa/identity.c:1650
 msgid "Manage Identities"
 msgstr "Upravljanje istovetnosti"
 
-#: ../libbalsa/identity.c:1699 ../libbalsa/smtp-server.c:473
-#: ../src/address-book-config.c:238 ../src/address-book-config.c:340
-#: ../src/address-book-config.c:386 ../src/filter-edit-callbacks.c:1248
-#: ../src/filter-edit-dialog.c:572 ../src/filter-export-dialog.c:80
-#: ../src/filter-run-dialog.c:317 ../src/folder-conf.c:312
-#: ../src/folder-conf.c:574 ../src/folder-conf.c:807 ../src/main-window.c:3910
-#: ../src/pref-manager.c:3299 ../src/toolbar-prefs.c:141
+#: ../libbalsa/identity.c:1654 ../libbalsa/smtp-server.c:328
+#: ../src/address-book-config.c:241 ../src/address-book-config.c:344
+#: ../src/address-book-config.c:390 ../src/filter-edit-callbacks.c:1239
+#: ../src/filter-edit-dialog.c:575 ../src/filter-export-dialog.c:81
+#: ../src/filter-run-dialog.c:301 ../src/folder-conf.c:470
+#: ../src/folder-conf.c:843 ../src/main-window.c:3783
+#: ../src/pref-manager.c:3261 ../src/toolbar-prefs.c:131 ../ui/ab-main.ui.h:16
+#: ../ui/main-window.ui.h:89
 msgid "_Help"
 msgstr "Pomo_č"
 
-#. new button
-#: ../libbalsa/identity.c:1700 ../src/filter-edit-dialog.c:224
-#: ../src/mailbox-node.c:1078
+#. Translators: button "New" identity
+#: ../libbalsa/identity.c:1656
+#, fuzzy
+#| msgid "_New"
+msgctxt "identity"
 msgid "_New"
 msgstr "_Novo"
 
-#: ../libbalsa/identity.c:1701 ../src/ab-main.c:853
-#: ../src/filter-edit-callbacks.c:1081 ../src/filter-edit-dialog.c:318
+#: ../libbalsa/identity.c:1657 ../src/ab-main.c:845
+#: ../src/filter-edit-callbacks.c:1072 ../src/filter-edit-dialog.c:320
 msgid "_Remove"
 msgstr "Od_strani"
 
-#: ../libbalsa/identity.c:2083
+#: ../libbalsa/identity.c:2041 ../libbalsa/libbalsa-gpgme-widgets.c:475
+msgid "disabled"
+msgstr "onemogočeno"
+
+#: ../libbalsa/identity.c:2043
+#, fuzzy
+#| msgid "Balsa Preferences"
+msgid "enabled, no preference"
+msgstr "Možnosti programa"
+
+#: ../libbalsa/identity.c:2045
+msgid "enabled, prefer encryption"
+msgstr "omogočeno, prednostno uporabljeno šifriranje"
+
+#: ../libbalsa/identity.c:2075
 msgid "GnuPG MIME mode"
 msgstr "Način GnuPG MIME"
 
-#: ../libbalsa/identity.c:2085
+#: ../libbalsa/identity.c:2077
 msgid "GnuPG OpenPGP mode"
 msgstr "Način GnuPG OpenPGP"
 
-#: ../libbalsa/identity.c:2087
+#: ../libbalsa/identity.c:2079
 msgid "GpgSM S/MIME mode"
 msgstr "Način GpgSM S/MIME "
 
+#: ../libbalsa/imap/auth-cram.c:47 ../libbalsa/imap/imap-auth.c:90
+#: ../libbalsa/imap/imap-auth.c:141
+#, fuzzy
+#| msgid "_Authentication:"
+msgid "Authentication cancelled"
+msgstr "_Overitev:"
+
+#: ../libbalsa/imap/auth-gssapi.c:130
+#, fuzzy
+#| msgid "Server requires authentication"
+msgid "User name required, authentication cancelled"
+msgstr "Strežnik zahteva overitev"
+
+#: ../libbalsa/imap/auth-gssapi.c:162
+#, fuzzy, c-format
+#| msgid "Sending the disposition notification failed: %s"
+msgid "GSSAPI authentication failed: %s"
+msgstr "Pošiljanje sporočila o prejetju je spodletelo: %s"
+
+#: ../libbalsa/imap/imap-auth.c:71
+msgid "No way to authenticate is known"
+msgstr ""
+
+#: ../libbalsa/imap/imap-auth.c:97
+msgid "Cannot LOGIN with UTF-8 username or password"
+msgstr ""
+
+#: ../libbalsa/imap/imap-commands.c:1217
+msgid "Unordered data received from server"
+msgstr ""
+
+#: ../libbalsa/imap/imap-commands.c:1752
+msgid "Bug in implementation of SORT command on IMAP server exposed."
+msgstr ""
+
+#: ../libbalsa/imap/imap-handle.c:676
+#, fuzzy, c-format
+#| msgid "Scanning of %s failed: %s"
+msgid "Connecting %s failed: %s"
+msgstr "Preiskovanje %s ni uspelo: %s"
+
+#: ../libbalsa/imap/imap-handle.c:689 ../libbalsa/imap/imap-handle.c:709
+#, fuzzy, c-format
+#| msgid "Send failed: %s"
+msgid "TLS negotiation failed: %s"
+msgstr "Pošiljanje je spodletelo: %s"
+
+#: ../libbalsa/imap/imap-handle.c:715
+#, fuzzy
+#| msgid "TLS requested but not compiled in"
+msgid "TLS required but not available"
+msgstr "TLS je bil zahtevan, vendar ni kodno preveden"
+
+#. it is not we, so it must be the server
+#: ../libbalsa/imap/imap-handle.c:2297 ../libbalsa/imap/imap-handle.c:2315
+#: ../libbalsa/imap/imap-handle.c:2331 ../libbalsa/imap/imap-handle.c:2362
+#, fuzzy, c-format
+#| msgid "IMAP server %s error: %s"
+msgid "IMAP response: %s"
+msgstr "Napaka strežnika IMAP %s: %s"
+
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:288
+#: ../libbalsa/imap-server.c:213
 #, c-format
 msgid ""
 "IMAP server %s alert:\n"
@@ -697,78 +985,59 @@ msgstr ""
 "%s"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:292
+#: ../libbalsa/imap-server.c:217
 #, c-format
 msgid "IMAP server %s error: %s"
 msgstr "Napaka strežnika IMAP %s: %s"
 
-#: ../libbalsa/imap-server.c:529 ../libbalsa/server.c:368
-#, fuzzy, c-format
-#| msgid "Error loading %s: %s\n"
-msgid "Error looking up password for %s@%s: %s\n"
-msgstr "Napaka med iskanjem bločne naprave za %s"
-
-#: ../libbalsa/imap-server.c:531 ../libbalsa/server.c:370
-#, fuzzy, c-format
-msgid "Falling back\n"
-msgstr ""
-"Ukaz IMAP SEARCH je za poštni predal %s spodletel\n"
-"vrnjeno na privzet način iskanja"
-
-#: ../libbalsa/imap-server.c:541 ../libbalsa/imap-server.c:577
-#: ../libbalsa/server.c:379 ../libbalsa/server.c:413 ../libbalsa/server.c:471
-#: ../libbalsa/server.c:485
-msgid "Balsa passwords"
-msgstr "Gesla Balsa"
-
-#: ../libbalsa/imap-server.c:550 ../libbalsa/server.c:388
-#: ../libbalsa/server.c:478
-#, fuzzy, c-format
-#| msgid "Error showing %s: %s\n"
-msgid "Error storing password for %s@%s: %s\n"
-msgstr "Napaka pri shranjevanju šifrirnega gesla v zbirki ključev (%s)"
-
-#: ../libbalsa/imap-server.c:628
+#: ../libbalsa/imap-server.c:466
 #, c-format
 msgid "Cannot connect to %s"
 msgstr "Ni se mogoče povezati z %s"
 
-#: ../libbalsa/imap-server.c:633 ../libbalsa/imap-server.c:638
+#: ../libbalsa/imap-server.c:471 ../libbalsa/imap-server.c:476
 #, c-format
 msgid "Cannot connect to the server: %s"
 msgstr "Ni se mogoče povezati s strežnikom: %s"
 
-#: ../libbalsa/imap-server.c:787
+#: ../libbalsa/imap-server.c:624
 #, c-format
 msgid "Exceeded the number of connections per server %s"
 msgstr "Prekoračeno je število povezav na strežnik %s"
 
-#: ../libbalsa/libbalsa.c:369
-msgid "Invalid date"
-msgstr "Neveljaven datum"
+#: ../libbalsa/imap-server.c:882
+#, c-format
+msgid "subscribing to “%s” failed"
+msgstr ""
 
-#: ../libbalsa/libbalsa.c:386 ../src/pref-manager.c:934
-#: ../src/pref-manager.c:3600
-msgid "Unknown"
-msgstr "Neznan"
+#: ../libbalsa/imap-server.c:898
+#, c-format
+msgid "unsubscribing from “%s” failed"
+msgstr ""
+
+#: ../libbalsa/libbalsa.c:398
+#, fuzzy
+#| msgid "SSL/TLS certificate"
+msgid "broken TLS certificate"
+msgstr "Potrdilo SSL/TLS"
 
-#: ../libbalsa/libbalsa.c:528 ../libbalsa/libbalsa.c:633
+#: ../libbalsa/libbalsa.c:402
 msgid "SSL/TLS certificate"
 msgstr "Potrdilo SSL/TLS"
 
-#: ../libbalsa/libbalsa.c:532 ../libbalsa/libbalsa.c:637
+#: ../libbalsa/libbalsa.c:406
 msgid "_Accept Once"
 msgstr "Sprejmi _enkrat"
 
-#: ../libbalsa/libbalsa.c:533 ../libbalsa/libbalsa.c:638
+#: ../libbalsa/libbalsa.c:407
 msgid "Accept & _Save"
 msgstr "Sprejmi in _shrani"
 
-#: ../libbalsa/libbalsa.c:534 ../libbalsa/libbalsa.c:639
+#: ../libbalsa/libbalsa.c:408
 msgid "_Reject"
 msgstr "_Zavrni"
 
-#: ../libbalsa/libbalsa.c:544
+#: ../libbalsa/libbalsa.c:413
 #, fuzzy, c-format
 #| msgid ""
 #| "Authenticity of this certificate could not be verified.\n"
@@ -782,120 +1051,141 @@ msgstr ""
 "<b>Vzrok:</b> %s\n"
 "<b>To potrdilo pripada:</b>\n"
 
-#: ../libbalsa/libbalsa.c:591
-#, c-format
-msgid ""
-"Authenticity of this certificate could not be verified.\n"
-"<b>Reason:</b> %s\n"
-"<b>This certificate belongs to:</b>\n"
+#: ../libbalsa/libbalsa.c:451
+msgid "the signing certificate authority is not known"
 msgstr ""
-"Pristnosti uporabljenega potrdila ni mogoče preveriti.\n"
-"<b>Vzrok:</b> %s\n"
-"<b>To potrdilo pripada:</b>\n"
 
-#: ../libbalsa/libbalsa.c:603
+#: ../libbalsa/libbalsa.c:452
 msgid ""
-"\n"
-"<b>This certificate was issued by:</b>\n"
+"the certificate does not match the expected identity of the site that it was "
+"retrieved from"
 msgstr ""
-"\n"
-"<b>Potrdilo je izdal:</b>\n"
 
-#: ../libbalsa/libbalsa.c:614
-#, c-format
-msgid ""
-"<b>This certificate is valid</b>\n"
-"from %s\n"
-"to %s\n"
-"<b>Fingerprint:</b> %s"
+#: ../libbalsa/libbalsa.c:453
+msgid "the certificate’s activation time is still in the future"
 msgstr ""
-"<b>To potrdilo je veljavno</b>\n"
-"od %s\n"
-"do %s\n"
-"<b>Prstni odtis:</b> %s"
 
-#: ../libbalsa/libbalsa.c:688
+#: ../libbalsa/libbalsa.c:454
+#, fuzzy
+#| msgid "C_ertificate Pass Phrase:"
+msgid "the certificate has expired"
+msgstr "_Šifrirno geslo:"
+
+#: ../libbalsa/libbalsa.c:455
+msgid "the certificate has been revoked"
+msgstr ""
+
+#: ../libbalsa/libbalsa.c:456
+msgid "the certificate’s algorithm is considered insecure"
+msgstr ""
+
+#: ../libbalsa/libbalsa.c:457
+#, fuzzy
+#| msgid "Error loading Face: %s"
+msgid "an error occurred validating the certificate"
+msgstr "Napaka med nalaganjem ponudnika '%s': %s"
+
+#: ../libbalsa/libbalsa.c:473
 #, c-format
-msgid "Connection to %s timed out. Abort?"
-msgstr "Povezava z %s je zakasnela. Ali naj bo preklicana?"
+msgid "unknown certificate validation error %u"
+msgstr ""
 
-#: ../libbalsa/libbalsa.c:845
+#: ../libbalsa/libbalsa.c:552
 #, c-format
 msgid "No image data"
 msgstr "Ni podatkov slike"
 
-#: ../libbalsa/libbalsa.c:879
+#: ../libbalsa/libbalsa.c:586
 #, c-format
 msgid "Invalid input format"
 msgstr "Neveljavna oblika vnosa"
 
-#: ../libbalsa/libbalsa.c:883
+#: ../libbalsa/libbalsa.c:590
 #, c-format
 msgid "Internal buffer overrun"
 msgstr "Notranja prekoračitev medpomnilnika"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/libbalsa.c:900
+#: ../libbalsa/libbalsa.c:607
 #, c-format
 msgid "Bad X-Face data"
 msgstr "Slabi podatki X-Face"
 
-#: ../libbalsa/libbalsa-conf.c:143
+#: ../libbalsa/libbalsa-conf.c:139
 #, fuzzy
 #| msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
 msgid "Your Balsa configuration is now stored in “~/.balsa/config”."
 msgstr "Nastavitve programa Balsa so shranjene v \"~/.balsa/config\"."
 
-#: ../libbalsa/libbalsa-gpgme.c:196
+#: ../libbalsa/libbalsa-gpgme.c:186
+msgid "OpenPGP"
+msgstr "OpenPGP"
+
+#: ../libbalsa/libbalsa-gpgme.c:188 ../src/balsa-message.c:2931
+msgid "S/MIME"
+msgstr "S/MIME"
+
+#: ../libbalsa/libbalsa-gpgme.c:256
 msgid "could not create context"
 msgstr "ni mogoče ustvariti vsebine"
 
-#: ../libbalsa/libbalsa-gpgme.c:200
+#: ../libbalsa/libbalsa-gpgme.c:260
 #, fuzzy, c-format
 #| msgid "could not set protocol '%s'"
 msgid "could not set protocol “%s”"
 msgstr "Ni mogoče določiti protokola za naslov URI %s"
 
-#: ../libbalsa/libbalsa-gpgme.c:260 ../libbalsa/libbalsa-gpgme.c:271
-#: ../libbalsa/libbalsa-gpgme.c:373 ../libbalsa/libbalsa-gpgme.c:496
-#: ../libbalsa/libbalsa-gpgme.c:589
+#: ../libbalsa/libbalsa-gpgme.c:314
+#, fuzzy, c-format
+#| msgid "could not list keys for \"%s\""
+msgid "could not set folder “%s” for engine “%s”"
+msgstr "Nekaterih ključev ni mogoče zapisati."
+
+#: ../libbalsa/libbalsa-gpgme.c:371 ../libbalsa/libbalsa-gpgme.c:382
+#: ../libbalsa/libbalsa-gpgme.c:483 ../libbalsa/libbalsa-gpgme.c:606
+#: ../libbalsa/libbalsa-gpgme.c:699
 msgid "could not get data from stream"
 msgstr "ni mogoče dobiti podatkov iz pretoka"
 
-#: ../libbalsa/libbalsa-gpgme.c:284 ../libbalsa/rfc3156.c:363
-#: ../libbalsa/rfc3156.c:368 ../libbalsa/rfc3156.c:534
-#: ../libbalsa/rfc3156.c:540
+#: ../libbalsa/libbalsa-gpgme.c:395 ../libbalsa/rfc3156.c:368
+#: ../libbalsa/rfc3156.c:373 ../libbalsa/rfc3156.c:541
+#: ../libbalsa/rfc3156.c:547
 msgid "signature verification failed"
 msgstr "preverjanje podpisa je spodelelo"
 
-#: ../libbalsa/libbalsa-gpgme.c:381 ../libbalsa/libbalsa-gpgme.c:505
-#: ../libbalsa/libbalsa-gpgme.c:597
+#: ../libbalsa/libbalsa-gpgme.c:491 ../libbalsa/libbalsa-gpgme.c:615
+#: ../libbalsa/libbalsa-gpgme.c:707
 msgid "could not create new data object"
 msgstr "ni mogoče ustvariti novega podatkovnega predmeta"
 
-#: ../libbalsa/libbalsa-gpgme.c:390
+#: ../libbalsa/libbalsa-gpgme.c:500
 msgid "signing failed"
 msgstr "podpisovanje je spodletelo"
 
-#: ../libbalsa/libbalsa-gpgme.c:464
+#: ../libbalsa/libbalsa-gpgme.c:574
 #, c-format
 msgid "combined signing and encryption is defined only for RFC 2440"
 msgstr "združeno podpisovanje in šifriranje je določeno le za RFC 2440"
 
-#: ../libbalsa/libbalsa-gpgme.c:532
+#: ../libbalsa/libbalsa-gpgme.c:642
 msgid "signing and encryption failed"
 msgstr "podpis in šifriranje sta spodletela"
 
-#: ../libbalsa/libbalsa-gpgme.c:534
+#: ../libbalsa/libbalsa-gpgme.c:644
 msgid "encryption failed"
 msgstr "šifriranje je spodletelo"
 
-#: ../libbalsa/libbalsa-gpgme.c:607 ../libbalsa/rfc3156.c:434
-#: ../libbalsa/rfc3156.c:439
+#: ../libbalsa/libbalsa-gpgme.c:717 ../libbalsa/rfc3156.c:441
+#: ../libbalsa/rfc3156.c:446
 msgid "decryption failed"
 msgstr "dešifriranje je spodletelo"
 
-#: ../libbalsa/libbalsa-gpgme.c:760
+#: ../libbalsa/libbalsa-gpgme.c:824
+#, c-format
+msgid "No private key for protocol %s is available for the signer “%s”"
+msgstr ""
+
+#: ../libbalsa/libbalsa-gpgme.c:974
 #, fuzzy, c-format
 #| msgid ""
 #| "%s: a key for %s is present, but it is expired, disabled, revoked or "
@@ -906,72 +1196,62 @@ msgstr ""
 "%s: ključ za %s je na prisoten, vendar je potekel, onemogočen, preklican ali "
 "pa neveljaven"
 
-#: ../libbalsa/libbalsa-gpgme.c:763
+#: ../libbalsa/libbalsa-gpgme.c:977
 #, fuzzy, c-format
 #| msgid "%s: could not find a key for %s"
 msgid "Could not find a key for “%s”"
 msgstr "Ni mogoče najti tujega ključa za \"'%s\""
 
-#: ../libbalsa/libbalsa-gpgme.c:778
+#: ../libbalsa/libbalsa-gpgme.c:992
 #, fuzzy, c-format
 #| msgid "%s: multiple keys for %s"
 msgid "Multiple keys for “%s”"
 msgstr "Več ključev"
 
-#: ../libbalsa/libbalsa-gpgme.c:800
+#: ../libbalsa/libbalsa-gpgme.c:1014
 #, fuzzy, c-format
 #| msgid "%s: insufficient validity for uid %s"
 msgid "Insufficient key validity"
 msgstr "Zaznan je dober podpis z nezadostno veljavnostjo"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:136
-msgid "User ID"
-msgstr "ID uporabnika"
-
-#: ../libbalsa/libbalsa-gpgme-cb.c:136
-msgid "Key ID"
-msgstr "ID Ključa"
-
-#: ../libbalsa/libbalsa-gpgme-cb.c:136
-msgid "Length"
-msgstr "Dolžina"
-
-#: ../libbalsa/libbalsa-gpgme-cb.c:136
-msgid "Validity"
-msgstr "Veljavnost"
-
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:153
+#: ../libbalsa/libbalsa-gpgme-cb.c:177
 msgid "Select key"
 msgstr "Izberi ključ"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:174
-#, c-format
-msgid "Select the private key for the signer %s"
+#: ../libbalsa/libbalsa-gpgme-cb.c:199
+#, fuzzy, c-format
+#| msgid "Select the private key for the signer %s"
+msgid "Select the private key for the signer “%s”"
 msgstr "Izberite osebni ključ za podpisnika %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:179
-#, c-format
-msgid "Select the public key for the recipient %s"
+#: ../libbalsa/libbalsa-gpgme-cb.c:204
+#, fuzzy, c-format
+#| msgid "Select the public key for the recipient %s"
+msgid "Select the public key for the recipient “%s”"
 msgstr "Izberite javni ključ za prejemnika %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:184
+#: ../libbalsa/libbalsa-gpgme-cb.c:209
 #, c-format
 msgid ""
-"There seems to be no public key for recipient %s in your key ring.\n"
+"There seems to be no public key for recipient “%s” in your key ring.\n"
 "If you are sure that the recipient owns a different key, select it from the "
 "list."
 msgstr ""
 
-#. create the dialog
-#: ../libbalsa/libbalsa-gpgme-cb.c:323
+#: ../libbalsa/libbalsa-gpgme-cb.c:269
+msgid "User ID"
+msgstr "ID uporabnika"
+
+#. create the dialog
+#: ../libbalsa/libbalsa-gpgme-cb.c:302
 #, c-format
 msgid ""
 "The owner trust for this key is “%s” only.\n"
 "Use this key anyway?"
 msgstr ""
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:325
+#: ../libbalsa/libbalsa-gpgme-cb.c:304
 #, fuzzy
 #| msgid "Insufficient trust for recipient %s"
 msgid "Insufficient key owner trust"
@@ -980,11 +1260,11 @@ msgstr ""
 "Zaupanje lastniku ključa: %s"
 
 #. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/libbalsa-gpgme-cb.c:355
+#: ../libbalsa/libbalsa-gpgme-cb.c:334
 msgid "Enter Passphrase"
 msgstr "Vnesite šifrirno frazo"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:383
+#: ../libbalsa/libbalsa-gpgme-cb.c:362
 #, c-format
 msgid ""
 "%s\n"
@@ -997,7 +1277,7 @@ msgstr ""
 "\n"
 "Ključ: %s"
 
-#: ../libbalsa/libbalsa-gpgme-cb.c:388
+#: ../libbalsa/libbalsa-gpgme-cb.c:367
 #, c-format
 msgid ""
 "%s\n"
@@ -1010,60 +1290,93 @@ msgstr ""
 "\n"
 "Ključ: %s"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:81
+#: ../libbalsa/libbalsa-gpgme-keys.c:94 ../libbalsa/libbalsa-gpgme-keys.c:162
 msgid "error setting key list mode"
 msgstr ""
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:88 ../libbalsa/libbalsa-gpgme-keys.c:113
+#: ../libbalsa/libbalsa-gpgme-keys.c:101 ../libbalsa/libbalsa-gpgme-keys.c:126
+#: ../libbalsa/libbalsa-gpgme-keys.c:168 ../libbalsa/libbalsa-gpgme-keys.c:172
 #, fuzzy, c-format
 #| msgid "could not list keys for \"%s\""
 msgid "could not list keys for “%s”"
 msgstr "Nekaterih ključev ni mogoče zapisati."
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:234
-#, c-format
+#: ../libbalsa/libbalsa-gpgme-keys.c:179
+#, fuzzy, c-format
+#| msgid "%s: multiple keys for %s"
+msgid "ambiguous keys for “%s”"
+msgstr "Več ključev"
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:248 ../libbalsa/libbalsa-gpgme-keys.c:291
+#: ../libbalsa/libbalsa-gpgme-keys.c:396
+#, fuzzy
+#| msgid "Cannot create temporary file"
+msgid "cannot create data buffer"
+msgstr "Ni mogoče ustvariti začasne datoteke"
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:256
+#, fuzzy, c-format
+#| msgid "%s: multiple keys for %s"
+msgid "exporting key for “%s” failed"
+msgstr "Več ključev"
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:316 ../libbalsa/libbalsa-gpgme-keys.c:324
+#, fuzzy, c-format
+#| msgid "%s: could not find a key for %s"
+msgid "cannot export minimal key for “%s”"
+msgstr "Ni mogoče najti tujega ključa za \"'%s\""
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:400
+#, fuzzy
+#| msgid "Removing duplicates failed: %s"
+msgid "importing key data failed"
+msgstr "Odstranjevanje dvojnikov ni uspelo: %s"
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:475
+#, fuzzy, c-format
 msgid "Cannot find a key with fingerprint %s on the key server."
-msgstr ""
+msgstr "Na tem mestu ni mogoče najti ključa »%s«."
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:238
-#, c-format
+#: ../libbalsa/libbalsa-gpgme-keys.c:480
+#, fuzzy, c-format
 msgid ""
+"Found %u key with fingerprint %s on the key server. Please check and import "
+"the proper key manually."
+msgid_plural ""
 "Found %u keys with fingerprint %s on the key server. Please check and import "
-"the proper key manually"
-msgstr ""
+"the proper key manually."
+msgstr[0] "Na tem mestu ni mogoče najti ključa »%s«."
+msgstr[1] "Na tem mestu ni mogoče najti ključa »%s«."
+msgstr[2] "Na tem mestu ni mogoče najti ključa »%s«."
+msgstr[3] "Na tem mestu ni mogoče najti ključa »%s«."
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:246
+#: ../libbalsa/libbalsa-gpgme-keys.c:490
 #, fuzzy, c-format
 #| msgid "Sending the external body request failed: %s"
 msgid "Searching the key server failed: %s"
 msgstr "Strežnik je vrnil neveljaven ključ \"%s\""
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:285
-#, fuzzy
-msgid "Key imported"
-msgstr "Uvoženo"
-
-#: ../libbalsa/libbalsa-gpgme-keys.c:325
+#: ../libbalsa/libbalsa-gpgme-keys.c:569
 #, fuzzy
 msgid "error importing key"
-msgstr "Napaka uvoza podatkov"
+msgstr "Napaka med uvažanjem stikov: %s"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:333
+#: ../libbalsa/libbalsa-gpgme-keys.c:604
 #, fuzzy
 msgid "No key was imported or updated."
 msgstr "Vrednost za posodobitev"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:336
+#: ../libbalsa/libbalsa-gpgme-keys.c:607
 #, fuzzy
 msgid "The key was imported into the local key ring."
 msgstr "Uvozi izbrane ključe v osebno zbirko ključev"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:340
+#: ../libbalsa/libbalsa-gpgme-keys.c:611
 #, fuzzy
 msgid "The key was updated in the local key ring:"
 msgstr "Uvozi izbrane ključe v osebno zbirko ključev"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:343
+#: ../libbalsa/libbalsa-gpgme-keys.c:614
 #, c-format
 msgid ""
 "\n"
@@ -1076,7 +1389,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:348
+#: ../libbalsa/libbalsa-gpgme-keys.c:619
 #, c-format
 msgid ""
 "\n"
@@ -1089,7 +1402,7 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:353
+#: ../libbalsa/libbalsa-gpgme-keys.c:624
 #, fuzzy, c-format
 #| msgid "Incl_ude signature"
 msgid ""
@@ -1103,7 +1416,7 @@ msgstr[1] "_Vključi podpis"
 msgstr[2] "_Vključi podpis"
 msgstr[3] "_Vključi podpis"
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:359
+#: ../libbalsa/libbalsa-gpgme-keys.c:630
 #, c-format
 msgid ""
 "\n"
@@ -1116,30 +1429,35 @@ msgstr[1] ""
 msgstr[2] ""
 msgstr[3] ""
 
-#: ../libbalsa/libbalsa-gpgme-keys.c:365
-msgid "No changes for the key were found on the key server."
+#: ../libbalsa/libbalsa-gpgme-keys.c:636
+msgid "The existing key in the key ring was not changed."
 msgstr ""
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:74
-#, fuzzy
+#: ../libbalsa/libbalsa-gpgme-widgets.c:95
+#: ../libbalsa/libbalsa-gpgme-widgets.c:253
 msgid "Key status:"
-msgstr "S _stanjem"
+msgstr "Stanje ključa:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:80
-#: ../libbalsa/libbalsa-gpgme-widgets.c:87
+#: ../libbalsa/libbalsa-gpgme-widgets.c:101
+#: ../libbalsa/libbalsa-gpgme-widgets.c:108
+#: ../libbalsa/libbalsa-gpgme-widgets.c:259
+#: ../libbalsa/libbalsa-gpgme-widgets.c:267
 msgid "User ID:"
 msgstr "ID uporabnika"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:80
+#: ../libbalsa/libbalsa-gpgme-widgets.c:101
+#: ../libbalsa/libbalsa-gpgme-widgets.c:259
 msgid "None"
 msgstr "Brez obrobe"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:85
+#: ../libbalsa/libbalsa-gpgme-widgets.c:106
+#: ../libbalsa/libbalsa-gpgme-widgets.c:265
 #, fuzzy
 msgid "Primary user ID:"
 msgstr "Ni mogoče zamenjati ID osnovnega uporabnika"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:97
+#: ../libbalsa/libbalsa-gpgme-widgets.c:119
+#: ../libbalsa/libbalsa-gpgme-widgets.c:274
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -1149,361 +1467,372 @@ msgstr ""
 "\n"
 "Zaupanje lastniku ključa: %s"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:107
+#: ../libbalsa/libbalsa-gpgme-widgets.c:129
+#: ../libbalsa/libbalsa-gpgme-widgets.c:281
 #, fuzzy
 msgid "Additional User IDs"
-msgstr "Dodatno"
+msgstr "Vprašaj uporabnika za dodatna določila"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:125
+#: ../libbalsa/libbalsa-gpgme-widgets.c:147
+#: ../libbalsa/libbalsa-gpgme-widgets.c:293
 msgid "Issuer"
 msgstr "Izdajatelj"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:136
+#: ../libbalsa/libbalsa-gpgme-widgets.c:158
+#: ../libbalsa/libbalsa-gpgme-widgets.c:299
 msgid "Name:"
 msgstr "Name:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:140
+#: ../libbalsa/libbalsa-gpgme-widgets.c:162
+#: ../libbalsa/libbalsa-gpgme-widgets.c:303
 msgid "Serial number:"
 msgstr "Zaporedna številka:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:143
+#: ../libbalsa/libbalsa-gpgme-widgets.c:168
+#: ../libbalsa/libbalsa-gpgme-widgets.c:306
 msgid "Chain ID:"
 msgstr "ID verige"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:154
+#. add button to show the full chain - copy the fingerprint as the key may be unref'ed...
+#: ../libbalsa/libbalsa-gpgme-widgets.c:171
+msgid "view certificate chain…"
+msgstr ""
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:191
+#: ../libbalsa/libbalsa-gpgme-widgets.c:315
 msgid "Subkey used"
 msgstr "Uporabljen podključ"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:162
+#: ../libbalsa/libbalsa-gpgme-widgets.c:200
 #, c-format
 msgid "Subkeys (%s only)"
 msgstr "Podključi (le %s)"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:167
+#: ../libbalsa/libbalsa-gpgme-widgets.c:205
 msgid "Subkeys"
 msgstr "Podključi"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:217 ../src/toolbar-factory.c:167
-msgid "Close"
-msgstr "Zapri"
-
-#: ../libbalsa/libbalsa-gpgme-widgets.c:221
-msgid "No"
-msgstr "Ne"
-
-#: ../libbalsa/libbalsa-gpgme-widgets.c:221
-msgid "Yes"
-msgstr "Da"
-
-#: ../libbalsa/libbalsa-gpgme-widgets.c:296
-msgid "revoked"
-msgstr "preklicano"
-
-#: ../libbalsa/libbalsa-gpgme-widgets.c:299
-msgid "expired"
-msgstr "pretečeno"
-
-#: ../libbalsa/libbalsa-gpgme-widgets.c:302
-msgid "disabled"
-msgstr "onemogočeno"
-
-#: ../libbalsa/libbalsa-gpgme-widgets.c:305
-msgid "invalid"
-msgstr "neveljavno"
-
-#: ../libbalsa/libbalsa-gpgme-widgets.c:443
+#: ../libbalsa/libbalsa-gpgme-widgets.c:329
+#: ../libbalsa/libbalsa-gpgme-widgets.c:642
+#: ../src/balsa-mime-widget-vcalendar.c:187
+#: ../src/balsa-print-object-text.c:545
 msgid "Status:"
 msgstr "Stanje:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:447
+#: ../libbalsa/libbalsa-gpgme-widgets.c:333
+#: ../libbalsa/libbalsa-gpgme-widgets.c:646
 msgid "Fingerprint:"
 msgstr "Prstni odtis:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:452
+#. add type and filename (if available)
+#: ../libbalsa/libbalsa-gpgme-widgets.c:336
+#: ../libbalsa/libbalsa-gpgme-widgets.c:649
+#: ../src/balsa-print-object-default.c:112
+#: ../src/balsa-print-object-default.c:115
+#: ../src/balsa-print-object-default.c:118
+msgid "Type:"
+msgstr "Vrsta:"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:342
+#: ../libbalsa/libbalsa-gpgme-widgets.c:655
 msgid "Capabilities:"
 msgstr "Zmožnosti:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:457
+#: ../libbalsa/libbalsa-gpgme-widgets.c:347
+#: ../libbalsa/libbalsa-gpgme-widgets.c:660
 #, fuzzy
 #| msgid "Invalid date"
 msgid "invalid timestamp"
 msgstr "Neveljavna vrednost časovnega žiga '%s'"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:459
+#: ../libbalsa/libbalsa-gpgme-widgets.c:349
+#: ../libbalsa/libbalsa-gpgme-widgets.c:662
 msgid "not available"
 msgstr "ni na voljo"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:463
+#: ../libbalsa/libbalsa-gpgme-widgets.c:353
+#: ../libbalsa/libbalsa-gpgme-widgets.c:666
+#: ../src/balsa-mime-widget-vcalendar.c:190
+#: ../src/balsa-print-object-text.c:548
 msgid "Created:"
 msgstr "Ustvarjeno:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:467 ../libbalsa/rfc3156.c:687
-#: ../libbalsa/rfc3156.c:722 ../src/address-book-config.c:197
-msgid "never"
-msgstr "nikoli"
-
-#. subkey_row = create_key_grid_row(GTK_GRID(subkey_grid), subkey_row, _("Expires:"), timebuf, FALSE);
-#: ../libbalsa/libbalsa-gpgme-widgets.c:472
+#: ../libbalsa/libbalsa-gpgme-widgets.c:361
+#: ../libbalsa/libbalsa-gpgme-widgets.c:674
 msgid "Expires:"
 msgstr "Preteče dne:"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:502
-#, fuzzy
+#: ../libbalsa/libbalsa-gpgme-widgets.c:393 ../src/toolbar-factory.c:142
+msgid "Close"
+msgstr "Zapri"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:397
+msgid "No"
+msgstr "Ne"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:397
+msgid "Yes"
+msgstr "Da"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:469
+msgid "revoked"
+msgstr "preklicano"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:472
+msgid "expired"
+msgstr "pretečeno"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:478
+msgid "invalid"
+msgstr "neveljavno"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:704
 msgid "sign"
-msgstr "Podpiši"
+msgstr "podpiši"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:505
-#, fuzzy
-#| msgid "Encrypt"
+#: ../libbalsa/libbalsa-gpgme-widgets.c:707
 msgid "encrypt"
-msgstr "Šifriraj"
+msgstr "šifriraj"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:508
-#, fuzzy
+#: ../libbalsa/libbalsa-gpgme-widgets.c:710
 msgid "certify"
-msgstr "Potrdi"
+msgstr "potrdi"
 
-#: ../libbalsa/libbalsa-gpgme-widgets.c:511
-#, fuzzy
+#: ../libbalsa/libbalsa-gpgme-widgets.c:713
 msgid "authenticate"
-msgstr "Overi"
+msgstr "overi"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:734
+#, c-format
+msgid "%u bit"
+msgid_plural "%u bits"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:740
+#, fuzzy, c-format
+#| msgid "Moved to \"%s\"."
+msgid " curve “%s”"
+msgstr ""
+"Datoteka »%s« je okvarjena in je ni mogoče razčleniti. Premaknjena je v "
+"»%s«, vstavek Latex pa bo povrnjen na osnoven nabor orodij."
 
-#: ../libbalsa/libbalsa-progress.c:65 ../src/main-window.c:3273
+#: ../libbalsa/libbalsa-progress.c:180
 msgid "_Hide"
 msgstr "_Skrij"
 
-#: ../libbalsa/libbalsa-vfs.c:557 ../src/sendmsg-window.c:4492
+#: ../libbalsa/libbalsa-vfs.c:495 ../src/sendmsg-window.c:4577
 #, c-format
 msgid "not a regular file"
 msgstr "ni običajna datoteka"
 
-#: ../libbalsa/libbalsa-vfs.c:609
+#: ../libbalsa/libbalsa-vfs.c:545
 #, c-format
 msgid "Cannot launch, missing application"
 msgstr "Ni mogoče zagnati; manjka program"
 
-#: ../libbalsa/libbalsa-vfs.c:675
+#: ../libbalsa/libbalsa-vfs.c:614
 #, c-format
 msgid "Open with %s"
 msgstr "Odpri z %s"
 
-#: ../libbalsa/libbalsa-vfs.c:728
+#: ../libbalsa/libbalsa-vfs.c:663
 #, c-format
 msgid "Open _part with %s"
 msgstr "Odpri _del z %s"
 
-#: ../libbalsa/mailbox.c:510
+#: ../libbalsa/mailbox.c:539
 #, c-format
 msgid "Cannot load mailbox %s"
 msgstr "Ni mogoče naložiti poštnega predala %s"
 
-#: ../libbalsa/mailbox.c:517
+#: ../libbalsa/mailbox.c:546
 #, c-format
 msgid "No such mailbox type: %s"
 msgstr "Ni takšne vrste poštnega predala: %s"
 
-#: ../libbalsa/mailbox.c:534
+#: ../libbalsa/mailbox.c:563
 #, fuzzy, c-format
 #| msgid "Bad local mailbox path \"%s\""
 msgid "Bad local mailbox path “%s”"
 msgstr "Lastnosti krajevnega poštnega predala %s"
 
-#: ../libbalsa/mailbox.c:539
+#: ../libbalsa/mailbox.c:573
 #, c-format
 msgid "Could not create a mailbox of type %s"
 msgstr "Ni mogoče ustvariti poštnega predala vrste %s"
 
-#: ../libbalsa/mailbox.c:854
+#: ../libbalsa/mailbox.c:922
 #, c-format
 msgid "Applying filter rules to %s"
 msgstr "Uveljavljanje pravil filtra na %s"
 
-#: ../libbalsa/mailbox.c:1019
+#: ../libbalsa/mailbox.c:1098
 #, c-format
 msgid "Copying from %s to %s"
 msgstr "Kopiranje iz %s v %s"
 
-#: ../libbalsa/mailbox.c:1953
-#, c-format
-msgid "libbalsa_mailbox_get_message: mailbox %s is closed"
-msgstr "libbalsa_mailbox_get_message: poštni predal %s je zaprt"
-
-#: ../libbalsa/mailbox.c:2158
+#: ../libbalsa/mailbox.c:2263
 #, c-format
 msgid "Removing messages from source mailbox failed"
 msgstr "Odstranjevanje sporočil iz izvornega predala je spodletelo"
 
-#: ../libbalsa/mailbox.c:2985
+#: ../libbalsa/mailbox.c:3234
 msgid "from unknown"
 msgstr "od neznanega pošiljatelja"
 
-#: ../libbalsa/mailbox.c:2987
-#, fuzzy
-#| msgid "Loading..."
+#: ../libbalsa/mailbox.c:3236
 msgid "Loading…"
-msgstr "Poteka nalaganje"
+msgstr "Poteka nalaganje ..."
 
-#: ../libbalsa/mailbox.c:3957
+#: ../libbalsa/mailbox.c:4287
 #, c-format
 msgid "Searching %s for partial messages"
 msgstr "Iskanje %s za delna sporočila"
 
-#: ../libbalsa/mailbox.c:4047
+#: ../libbalsa/mailbox.c:4377
 msgid "Reconstructing message"
 msgstr "Ponovna izgradnja sporočila"
 
-#: ../libbalsa/mailbox.c:4306
+#: ../libbalsa/mailbox.c:4646
 #, c-format
 msgid "Finding duplicate messages in source mailbox failed"
 msgstr "Iskanje podvojenih sporočil v izvornem poštnem predalu je spodletelo"
 
+#: ../libbalsa/mailbox.h:49 ../libbalsa/mailbox.h:58
+#, c-format
+msgid "*** ERROR: Mailbox Stream Closed: %s ***\n"
+msgstr ""
+
 #. ImapIssue macro handles reconnecting. We might issue a
 #. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
 #. login information...
-#: ../libbalsa/mailbox_imap.c:613
+#: ../libbalsa/mailbox_imap.c:596
 #, fuzzy
 #| msgid "IMAP connection has been severed. Reconnecting..."
 msgid "IMAP connection has been severed. Reconnecting…"
 msgstr "Povezava IMAP je bila prekinjena. Ponovno povezovanje ..."
 
-#: ../libbalsa/mailbox_imap.c:616
+#: ../libbalsa/mailbox_imap.c:599
 msgid "IMAP protocol error. Try enabling bug workarounds."
 msgstr "Napaka protokola IMAP. Poskusite omogočiti obhode hroščev."
 
-#: ../libbalsa/mailbox_imap.c:619
+#: ../libbalsa/mailbox_imap.c:602
 #, fuzzy, c-format
 #| msgid "IMAP server has shut the connection: %s Reconnecting..."
 msgid "IMAP server has shut the connection: %s Reconnecting…"
 msgstr "Strežnik IMAP je prekinil povezavo: %s Ponovno povezovanje ..."
 
-#: ../libbalsa/mailbox_imap.c:631
+#: ../libbalsa/mailbox_imap.c:614
 #, fuzzy, c-format
 #| msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
 msgid "Async IMAP cmd %s could not be executed. Reconnecting…"
 msgstr "Neusklajenega IMAP ukaza %s ni mogoče izvesti. Ponovno povezovanje ..."
 
-#: ../libbalsa/mailbox_imap.c:1124 ../libbalsa/mailbox_maildir.c:503
-#: ../libbalsa/mailbox_mbox.c:754 ../libbalsa/mailbox_mh.c:539
-#, c-format
-msgid "%s: Opening %s Refcount: %d\n"
-msgstr "%s: Odpiranje %s, Števec sklicev: %d\n"
-
-#: ../libbalsa/mailbox_imap.c:1211
+#: ../libbalsa/mailbox_imap.c:1195
 #, c-format
 msgid "Downloading %ld kB"
 msgstr "Prejemanje %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:1610
-#, c-format
-msgid ""
-"IMAP SEARCH command failed for mailbox %s\n"
-"falling back to default searching method"
-msgstr ""
-"Ukaz IMAP SEARCH je za poštni predal %s spodletel\n"
-"vrnjeno na privzet način iskanja"
-
-#: ../libbalsa/mailbox_imap.c:1670
+#: ../libbalsa/mailbox_imap.c:1661
 #, fuzzy, c-format
 #| msgid "No path found for mailbox \"%s\", using \"%s\""
 msgid "No path found for mailbox “%s”, using “%s”"
 msgstr "\"%s\" ni mogoče najti na poti"
 
-#: ../libbalsa/mailbox_imap.c:1798 ../libbalsa/mailbox_imap.c:1839
+#: ../libbalsa/mailbox_imap.c:1768 ../libbalsa/mailbox_imap.c:1809
 #, c-format
 msgid "Cannot get IMAP handle"
 msgstr "Ni mogoče dobiti ročice IMAP"
 
-#: ../libbalsa/mailbox_imap.c:2444 ../libbalsa/mailbox_imap.c:2510
+#: ../libbalsa/mailbox_imap.c:2431 ../libbalsa/mailbox_imap.c:2494
 #, c-format
 msgid "Error fetching message from IMAP server: %s"
 msgstr "Napaka med pridobivanjem sporočila s strežnika IMAP: %s"
 
-#: ../libbalsa/mailbox_imap.c:2478
+#: ../libbalsa/mailbox_imap.c:2466
 #, c-format
 msgid "Downloading %u kB"
 msgstr "Prejemanje %u kB"
 
-#: ../libbalsa/mailbox_imap.c:2522
+#: ../libbalsa/mailbox_imap.c:2507
 #, c-format
 msgid "Cannot create temporary file"
 msgstr "Ni mogoče ustvariti začasne datoteke"
 
-#: ../libbalsa/mailbox_imap.c:2542
+#: ../libbalsa/mailbox_imap.c:2531
 #, c-format
 msgid "Cannot write to temporary file %s"
 msgstr "Ni mogoče pisati v začasno datoteko %s"
 
-#: ../libbalsa/mailbox_imap.c:2771 ../libbalsa/mailbox_imap.c:2890
+#: ../libbalsa/mailbox_imap.c:2758 ../libbalsa/mailbox_imap.c:2875
 #, c-format
 msgid "Uploading %ld kB"
 msgstr "Pošiljanje %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:3192
+#: ../libbalsa/mailbox_imap.c:3178
 msgid "Server-side threading not supported."
 msgstr "Strežniško nitenje ni podprto."
 
-#: ../libbalsa/mailbox_local.c:571
+#: ../libbalsa/mailbox_local.c:573
 #, fuzzy, c-format
 #| msgid "Failed to save cache file \"%s\": %s."
 msgid "Failed to save cache file “%s”: %s."
 msgstr "Branje datoteke predpomnilnika %s je spodletelo: %s."
 
-#: ../libbalsa/mailbox_local.c:605
-#, c-format
-msgid "Cache file for mailbox %s will be created"
-msgstr "Za poštni predal %s bo ustvarjena predpomnilniška datoteka"
-
-#: ../libbalsa/mailbox_local.c:614
+#: ../libbalsa/mailbox_local.c:616
 #, c-format
 msgid "Failed to read cache file %s: %s"
 msgstr "Branje datoteke predpomnilnika %s je spodletelo: %s."
 
-#: ../libbalsa/mailbox_local.c:632 ../libbalsa/mailbox_local.c:651
-#: ../libbalsa/mailbox_local.c:675
+#: ../libbalsa/mailbox_local.c:634 ../libbalsa/mailbox_local.c:651
+#: ../libbalsa/mailbox_local.c:674
 #, c-format
 msgid "Cache file for mailbox %s will be repaired"
 msgstr "Za poštni predal %s bo predpomnilniška datoteka popravljena"
 
-#: ../libbalsa/mailbox_local.c:1248
+#: ../libbalsa/mailbox_local.c:1295
 #, c-format
 msgid "Filtering %s"
 msgstr "Filtriranje %s"
 
-#: ../libbalsa/mailbox_local.c:1337
+#: ../libbalsa/mailbox_local.c:1358
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravljanje %s"
 
-#: ../libbalsa/mailbox_local.c:2133
+#: ../libbalsa/mailbox_local.c:2115
 #, c-format
 msgid "Open of %s failed. Errno = %d, "
 msgstr "Odpiranje %s je spodletelo. Napaka št. %d, "
 
-#: ../libbalsa/mailbox_local.c:2155
+#: ../libbalsa/mailbox_local.c:2138
 #, fuzzy, c-format
 #| msgid "Failed to sync mailbox \"%s\""
 msgid "Failed to sync mailbox “%s”"
 msgstr "Uveljavljanje poštnega predala %s ni uspelo."
 
-#: ../libbalsa/mailbox_maildir.c:191
+#: ../libbalsa/mailbox_maildir.c:175
 #, c-format
 msgid "Mailbox %s does not appear to be a Maildir mailbox."
 msgstr "Poštni predal %s ni videti kot poštni predal v obliki Maildir."
 
-#: ../libbalsa/mailbox_maildir.c:200
+#: ../libbalsa/mailbox_maildir.c:184
 #, fuzzy, c-format
 #| msgid "Could not create a MailDir directory at %s (%s)"
 msgid "Could not create a Maildir directory at %s (%s)"
-msgstr "Ni mogoče ustvariti začasne mape v “%s”."
+msgstr "Ni mogoče ustvariti začasne mape v »%s«."
 
-#: ../libbalsa/mailbox_maildir.c:208 ../libbalsa/mailbox_maildir.c:217
-#: ../libbalsa/mailbox_maildir.c:228
+#: ../libbalsa/mailbox_maildir.c:192 ../libbalsa/mailbox_maildir.c:201
+#: ../libbalsa/mailbox_maildir.c:212
 #, fuzzy, c-format
 #| msgid "Could not create a MailDir at %s (%s)"
 msgid "Could not create a Maildir at %s (%s)"
-msgstr "Pretoka ni mogoče ustvariti: %s"
+msgstr "Ni mogoče ustvariti mape '%s'"
 
-#: ../libbalsa/mailbox_maildir.c:335 ../libbalsa/mailbox_mh.c:289
+#: ../libbalsa/mailbox_maildir.c:318
 #, c-format
 msgid ""
 "Could not remove contents of %s:\n"
@@ -1512,8 +1841,7 @@ msgstr ""
 "Ni mogoče odstraniti vsebine %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:341 ../libbalsa/mailbox_mbox.c:314
-#: ../libbalsa/mailbox_mh.c:295
+#: ../libbalsa/mailbox_maildir.c:324
 #, c-format
 msgid ""
 "Could not remove %s:\n"
@@ -1522,36 +1850,46 @@ msgstr ""
 "Ni mogoče odstraniti %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:484 ../libbalsa/mailbox_mbox.c:701
-#: ../libbalsa/mailbox_mh.c:522
+#: ../libbalsa/mailbox_maildir.c:467 ../libbalsa/mailbox_mbox.c:651
+#: ../libbalsa/mailbox_mh.c:507
 #, c-format
 msgid "Mailbox does not exist."
 msgstr "Poštni predal ne obstaja."
 
-#: ../libbalsa/mailbox_maildir.c:924 ../libbalsa/mailbox_mbox.c:1985
-#: ../libbalsa/mailbox_mh.c:1102
+#: ../libbalsa/mailbox_maildir.c:908 ../libbalsa/mailbox_mbox.c:1931
+#: ../libbalsa/mailbox_mh.c:1086
 #, c-format
 msgid "Data copy error"
 msgstr "Napaka kopiranja podatkov"
 
-#: ../libbalsa/mailbox_mbox.c:199
+#: ../libbalsa/mailbox_mbox.c:172
 #, fuzzy, c-format
 #| msgid "Mailbox %s does not appear to be an Mbox mailbox."
 msgid "Mailbox %s does not appear to be an mbox mailbox."
 msgstr "Poštni predal %s ni videti kot poštni predal v obliki Maildir."
 
-#: ../libbalsa/mailbox_mbox.c:417
+#: ../libbalsa/mailbox_mbox.c:279 ../libbalsa/mailbox_mh.c:278
+#, fuzzy, c-format
+#| msgid ""
+#| "Could not remove %s:\n"
+#| "%s"
+msgid "Could not remove %s: %s"
+msgstr ""
+"Ni mogoče odstraniti %s:\n"
+"%s"
+
+#: ../libbalsa/mailbox_mbox.c:384
 #, c-format
 msgid "Could not write file %s: %s"
 msgstr "Ni mogoče pisati v datoteko %s: %s"
 
-#: ../libbalsa/mailbox_mbox.c:429
+#: ../libbalsa/mailbox_mbox.c:396
 #, fuzzy, c-format
 #| msgid "Failed to create temporary file \"%s\": %s"
 msgid "Failed to create temporary file “%s”: %s"
 msgstr "Ni mogoče ustvariti začasne datoteke: %s"
 
-#: ../libbalsa/mailbox_mbox.c:441
+#: ../libbalsa/mailbox_mbox.c:408
 #, fuzzy, c-format
 #| msgid "Failed to save cache file \"%s\": %s.  New version saved as \"%s\""
 msgid "Failed to save cache file “%s”: %s. New version saved as “%s”"
@@ -1559,592 +1897,762 @@ msgstr ""
 "Napaka med shranjevanjem predpomnilniške datoteke \"%s\": %s.  Nova "
 "različica datoteke je bila shranjena kot \"%s\""
 
-#: ../libbalsa/mailbox_mbox.c:449
+#: ../libbalsa/mailbox_mbox.c:416
 #, c-format
 msgid "Could not unlink file %s: %s"
 msgstr "Ni mogoče razvezati datoteke %s: %s"
 
-#: ../libbalsa/mailbox_mbox.c:709
+#: ../libbalsa/mailbox_mbox.c:660
 #, c-format
 msgid "Cannot open mailbox."
 msgstr "Ni mogoče odpreti poštnega predala."
 
-#: ../libbalsa/mailbox_mbox.c:721
+#: ../libbalsa/mailbox_mbox.c:672
 #, c-format
 msgid "Mailbox is not in mbox format."
 msgstr "Predal ni v obliki mbox."
 
-#: ../libbalsa/mailbox_mbox.c:729
+#: ../libbalsa/mailbox_mbox.c:680
 #, c-format
 msgid "Cannot lock mailbox."
 msgstr "Ni mogoče zakleniti poštnega predala."
 
-#: ../libbalsa/mailbox_mbox.c:1941
+#: ../libbalsa/mailbox_mbox.c:1887
 #, c-format
 msgid "%s: could not open %s."
 msgstr "%s: ni mogoče odpreti %s."
 
-#: ../libbalsa/mailbox_mbox.c:1953
+#: ../libbalsa/mailbox_mbox.c:1899
 #, fuzzy, c-format
 #| msgid "%s: could not get new mime stream."
 msgid "%s: could not get new MIME stream."
 msgstr "Ni mogoče pridobiti poveril za obnovitev istovetnosti %s: %k"
 
-#: ../libbalsa/mailbox_mbox.c:1961
+#: ../libbalsa/mailbox_mbox.c:1907
 #, c-format
 msgid "%s: %s is not in mbox format."
 msgstr "%s: %s ni oblike mbox ."
 
-#: ../libbalsa/mailbox_mh.c:170
+#: ../libbalsa/mailbox_mh.c:155
 #, fuzzy, c-format
 #| msgid "Mailbox %s does not appear to be a Mh mailbox."
 msgid "Mailbox %s does not appear to be an MH mailbox."
 msgstr "Poštni predal %s ni videti kot poštni predal v obliki Maildir."
 
-#: ../libbalsa/mailbox_mh.c:180
+#: ../libbalsa/mailbox_mh.c:165
 #, c-format
 msgid "Could not create MH directory at %s (%s)"
 msgstr "Ni mogoče ustvariti mape MH %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:192
+#: ../libbalsa/mailbox_mh.c:177
 #, c-format
 msgid "Could not create MH structure at %s (%s)"
 msgstr "Ni mogoče ustvariti strukture MH na %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:1083
+#: ../libbalsa/mailbox_mh.c:272
+#, fuzzy, c-format
+#| msgid ""
+#| "Could not remove contents of %s:\n"
+#| "%s"
+msgid "Could not remove contents of %s: %s"
+msgstr ""
+"Ni mogoče odstraniti vsebine %s:\n"
+"%s"
+
+#: ../libbalsa/mailbox_mh.c:1068
 #, c-format
 msgid "Cannot create message"
 msgstr "Ni mogoče ustvariti sporočila"
 
-#: ../libbalsa/mailbox_mh.c:1127
+#: ../libbalsa/mailbox_mh.c:1111
 #, c-format
 msgid "Message rename error"
 msgstr "Napaka preimenovanja sporočila"
 
-#: ../libbalsa/mailbox_pop3.c:259
+#: ../libbalsa/mailbox_pop3.c:241
 #, fuzzy, c-format
 #| msgid "Saving sent message to %s failed: %s"
 msgid "Saving the POP3 message UID list failed: %s"
 msgstr "Shranjevanje poslanega sporočila v %s ni uspelo: %s"
 
-#: ../libbalsa/mailbox_pop3.c:297 ../libbalsa/mailbox_pop3.c:321
+#: ../libbalsa/mailbox_pop3.c:279 ../libbalsa/mailbox_pop3.c:303
 #, fuzzy, c-format
 #| msgid "Saving POP message to %s failed"
 msgid "Passing POP message to %s failed: %s"
 msgstr "Overitev na strežniku POP %s je spodletela:"
 
-#: ../libbalsa/mailbox_pop3.c:326
+#: ../libbalsa/mailbox_pop3.c:308
 #, fuzzy, c-format
 #| msgid "Saving POP message to %s failed"
 msgid "Saving POP message failed"
-msgstr "Omejitev velikosti sporočila _POP:"
+msgstr "Shranjevanje poslanega sporočila v %s ni uspelo: %s"
 
-#: ../libbalsa/mailbox_pop3.c:345
+#: ../libbalsa/mailbox_pop3.c:327
 #, fuzzy, c-format
 #| msgid "Transferring POP message to %s failed."
 msgid "Transferring POP message to %s failed: %s"
 msgstr "Overitev na strežniku POP %s je spodletela:"
 
-#: ../libbalsa/mailbox_pop3.c:380
+#: ../libbalsa/mailbox_pop3.c:363
 #, fuzzy, c-format
 #| msgid "Message from %s: %s"
 msgid "Message %lu of %lu (%s of %s)"
 msgstr "Položaj: %lu od %lu\tStolpec: %d\t%s"
 
-#: ../libbalsa/mailbox_pop3.c:437
+#: ../libbalsa/mailbox_pop3.c:426
 #, c-format
 msgid "Error appending message %d from %s to %s: %s"
 msgstr "Napaka med pripenjanjem sporočila %d iz %s v %s: %s"
 
-#: ../libbalsa/mailbox_pop3.c:495 ../libbalsa/send.c:787
+#: ../libbalsa/mailbox_pop3.c:493 ../libbalsa/send.c:806
 #, fuzzy, c-format
 #| msgid "Could not load Face header file %s: %s"
 msgid "Cannot load certificate file %s: %s"
-msgstr "Ni mogoče naložiti datoteke skladnje »%s«"
+msgstr "Ni mogoče naložiti datoteke %s. Opravilo je predčasno končano."
+
+#. connect server
+#: ../libbalsa/mailbox_pop3.c:510 ../libbalsa/send.c:1049
+#, fuzzy, c-format
+#| msgid "Connected to MTA"
+msgid "Connecting %s…"
+msgstr "Ni povezave s %s"
 
-#: ../libbalsa/mailbox_pop3.c:509
+#: ../libbalsa/mailbox_pop3.c:512
 #, fuzzy, c-format
 #| msgid "POP3 mailbox %s error: %s\n"
 msgid "POP3 mailbox %s: cannot connect %s: %s"
 msgstr "Ni mogoče odpreti začasnega poštnega predala: %s"
 
-#: ../libbalsa/mailbox_pop3.c:518
+#. load message list
+#: ../libbalsa/mailbox_pop3.c:525
+#, fuzzy
+#| msgid "H_ide messages"
+msgid "List messages…"
+msgstr "S_krij sporočila"
+
+#: ../libbalsa/mailbox_pop3.c:527
 #, fuzzy, c-format
 #| msgid "POP3 mailbox %s error: %s\n"
 msgid "POP3 mailbox %s error: %s"
-msgstr "Strežnik POP3 %s"
+msgstr "Strežnik POP3 za %s na %s"
 
-#: ../libbalsa/mailbox_pop3.c:562
+#: ../libbalsa/mailbox_pop3.c:574
 #, fuzzy, c-format
 #| msgid "POP3 message %d oversized: %d kB - skipped."
 msgid "POP3 message %d oversized: %s — skipped."
 msgstr "POP3 sporočilo %d je preveliko: %d kB - izpuščeno."
 
-#: ../libbalsa/mailbox_pop3.c:640
-msgid "Connected"
-msgstr "Povezano"
+#: ../libbalsa/mailbox_pop3.c:649 ../libbalsa/send.c:1059
+#, c-format
+msgid "Connected to %s"
+msgstr "Vzpostavljena je povezava s strežnikom %s"
 
-#: ../libbalsa/mailbox_pop3.c:654
+#: ../libbalsa/mailbox_pop3.c:665
 #, fuzzy, c-format
 #| msgid "New message to %s: %s"
-msgid "%lu new messages (%s)"
-msgstr "%s: preiskovanje novih sporočil"
-
-#: ../libbalsa/mailbox_pop3.c:665
-#, fuzzy
-#| msgid "Deleting messages"
+msgid "%lu new message (%s)"
+msgid_plural "%lu new messages (%s)"
+msgstr[0] "%s: preiskovanje novih sporočil"
+msgstr[1] "%s: preiskovanje novih sporočil"
+msgstr[2] "%s: preiskovanje novih sporočil"
+msgstr[3] "%s: preiskovanje novih sporočil"
+
+#: ../libbalsa/mailbox_pop3.c:676
 msgid "Deleting messages on server…"
-msgstr "Brisanje sporočilc s strežnika ..."
+msgstr "Poteka brisanje sporočil s strežnika …"
 
-#: ../libbalsa/mailbox_pop3.c:687
-#, fuzzy, c-format
-#| msgid "POP3 error: %s."
+#: ../libbalsa/mailbox_pop3.c:701
+#, c-format
 msgid "POP3 error: %s"
-msgstr "Strežnik POP3 %s"
+msgstr "Napaka POP3: %s"
 
-#. done - clean up
-#: ../libbalsa/mailbox_pop3.c:694 ../libbalsa/send.c:1085
-#, c-format
+#: ../libbalsa/mailbox_pop3.c:711 ../libbalsa/send.c:1140
 msgid "Finished"
 msgstr "Končano"
 
-#: ../libbalsa/message.c:618
+#: ../libbalsa/message.c:687
 #, fuzzy, c-format
 #| msgid "Mailbox (%s) is readonly: cannot change flags."
 msgid "Mailbox (%s) is read-only: cannot change flags."
 msgstr ""
 "Poštni predal (%s) je odprt le za branje: ni mogoče spremeniti zastavice."
 
-#: ../libbalsa/misc.c:395
-#, fuzzy
-#| msgid "west european"
+#: ../libbalsa/misc.c:384
 msgid "West European"
-msgstr "Zahodnoevropski (HP)"
+msgstr "Zahodnoevropski"
 
-#: ../libbalsa/misc.c:397 ../libbalsa/misc.c:431
-#, fuzzy
-#| msgid "east european"
+#: ../libbalsa/misc.c:386 ../libbalsa/misc.c:420
 msgid "East European"
-msgstr "Vzhod"
+msgstr "Vzhodnoevropski"
 
-#: ../libbalsa/misc.c:399
+#: ../libbalsa/misc.c:388
 msgid "South European"
 msgstr "Južnoevropski"
 
-#: ../libbalsa/misc.c:401
+#: ../libbalsa/misc.c:390
 msgid "North European"
 msgstr "severnoevropsko"
 
-#: ../libbalsa/misc.c:403 ../libbalsa/misc.c:433
+#: ../libbalsa/misc.c:392 ../libbalsa/misc.c:422
 msgid "Cyrillic"
 msgstr "Cirilica"
 
-#: ../libbalsa/misc.c:405 ../libbalsa/misc.c:439
+#: ../libbalsa/misc.c:394 ../libbalsa/misc.c:428
 msgid "Arabic"
 msgstr "Arabski"
 
-#: ../libbalsa/misc.c:407 ../libbalsa/misc.c:435
+#: ../libbalsa/misc.c:396 ../libbalsa/misc.c:424
 msgid "Greek"
 msgstr "Grški"
 
-#: ../libbalsa/misc.c:409 ../libbalsa/misc.c:437
+#: ../libbalsa/misc.c:398 ../libbalsa/misc.c:426
 msgid "Hebrew"
 msgstr "Hebrejski"
 
-#: ../libbalsa/misc.c:411
+#: ../libbalsa/misc.c:400
 msgid "Turkish"
 msgstr "Turški"
 
-#: ../libbalsa/misc.c:413
+#: ../libbalsa/misc.c:402
 msgid "Nordic"
 msgstr "Nordijski"
 
-#: ../libbalsa/misc.c:415
+#: ../libbalsa/misc.c:404
 msgid "Thai"
 msgstr "Tajski"
 
-#: ../libbalsa/misc.c:417 ../libbalsa/misc.c:441
+#: ../libbalsa/misc.c:406 ../libbalsa/misc.c:430
 msgid "Baltic"
 msgstr "Baltski"
 
-#: ../libbalsa/misc.c:419
+#: ../libbalsa/misc.c:408
 msgid "Celtic"
 msgstr "Keltski"
 
-#: ../libbalsa/misc.c:421
-#, fuzzy
-#| msgid "west europe (euro)"
+#: ../libbalsa/misc.c:410
 msgid "West European (euro)"
-msgstr "Zahodnoevropski (DEC)"
+msgstr "Zahodnoevropski (evro)"
 
-#: ../libbalsa/misc.c:423
+#: ../libbalsa/misc.c:412
 msgid "Russian"
 msgstr "ruski"
 
-#: ../libbalsa/misc.c:425
+#: ../libbalsa/misc.c:414
 msgid "Ukrainian"
 msgstr "Ukrajinsko"
 
-#: ../libbalsa/misc.c:427
+#: ../libbalsa/misc.c:416
 msgid "Japanese"
 msgstr "Japonski"
 
-#: ../libbalsa/misc.c:429
+#: ../libbalsa/misc.c:418
 msgid "Korean"
 msgstr "Korejski"
 
-#: ../libbalsa/misc.c:622
+#: ../libbalsa/misc.c:611
 #, c-format
 msgid "Cannot open %s: %s"
 msgstr "Ni mogoče odpreti %s: %s"
 
-#: ../libbalsa/misc.c:631
+#: ../libbalsa/misc.c:620
 #, c-format
 msgid "Cannot open %s: is a symbolic link"
 msgstr "Ni mogoče odpreti %s: datoteka je simbolna povezava"
 
-#: ../libbalsa/misc.c:758
+#: ../libbalsa/misc.c:731
+#, fuzzy, c-format
+#| msgid "Send failed: %s"
+msgid "fcntl failed: %s."
+msgstr "Pošiljanje je spodletelo: %s"
+
+#: ../libbalsa/misc.c:747
 msgid "Timeout exceeded while attempting fcntl lock!"
 msgstr "Zakasnitev je bila presežena med poskusom zaklepanja fcntl !"
 
-#: ../libbalsa/misc.c:765
+#: ../libbalsa/misc.c:754
 #, fuzzy, c-format
 #| msgid "Waiting for fcntl lock... %d"
 msgid "Waiting for fcntl lock… %d"
 msgstr "Zakasnitev je bila presežena med poskusom zaklepanja fcntl !"
 
-#: ../libbalsa/misc.c:793
+#: ../libbalsa/misc.c:783
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "Zakasnitev med poskusom zaklepanja flock!"
 
-#: ../libbalsa/misc.c:800
+#: ../libbalsa/misc.c:791
 #, fuzzy, c-format
 #| msgid "Waiting for flock attempt... %d"
 msgid "Waiting for flock attempt… %d"
 msgstr "Ponovno prejemanje (poskus %d/%d) ..."
 
-#: ../libbalsa/misc.c:1077
+#: ../libbalsa/misc.c:1096
 #, c-format
 msgid "LDAP Directory for %s"
 msgstr "Mapa LDAP za %s"
 
-#: ../libbalsa/rfc2445.c:88 ../libbalsa/rfc2445.c:697 ../libbalsa/rfc2445.c:716
-#: ../libbalsa/rfc3156.c:683
-msgid "unknown"
-msgstr "neznan"
+#: ../libbalsa/rfc2445.c:364
+msgid "week"
+msgid_plural "weeks"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: ../libbalsa/rfc2445.c:89
-msgid "needs action"
-msgstr "zahteva dejanje"
+#: ../libbalsa/rfc2445.c:371 ../libbalsa/rfc2445.c:696
+#: ../libbalsa/rfc2445.c:700 ../libbalsa/rfc2445.c:743
+msgid "day"
+msgid_plural "days"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: ../libbalsa/rfc2445.c:90
-msgid "accepted"
-msgstr "sprejeto"
+#: ../libbalsa/rfc2445.c:378
+msgid "hour"
+msgid_plural "hours"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: ../libbalsa/rfc2445.c:91
-msgid "declined"
-msgstr "odklonjeno"
+#: ../libbalsa/rfc2445.c:385
+#, fuzzy
+#| msgid "minutes"
+msgid "minute"
+msgid_plural "minutes"
+msgstr[0] "minut"
+msgstr[1] "minut"
+msgstr[2] "minut"
+msgstr[3] "minut"
 
-#: ../libbalsa/rfc2445.c:92
-msgid "tentatively accepted"
-msgstr "poskusno sprejeto"
+#: ../libbalsa/rfc2445.c:392
+msgid "second"
+msgid_plural "seconds"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
 
-#: ../libbalsa/rfc2445.c:93
-msgid "delegated"
-msgstr "pooblaščeno"
+#: ../libbalsa/rfc2445.c:416
+#, fuzzy
+#| msgid "Accept tentatively"
+msgid "event is tentative"
+msgstr "Poskusno sprejmi"
 
-#: ../libbalsa/rfc2445.c:94
-msgid "completed"
-msgstr "končano"
+#: ../libbalsa/rfc2445.c:417
+msgid "event is definite"
+msgstr ""
 
-#: ../libbalsa/rfc2445.c:95
-msgid "in process"
-msgstr "v obdelavi"
+#: ../libbalsa/rfc2445.c:418
+msgid "event was cancelled"
+msgstr ""
 
-#: ../libbalsa/rfc2445.c:698
+#: ../libbalsa/rfc2445.c:445
 msgid "Event Notification"
 msgstr "Obvestilo dogodka"
 
-#: ../libbalsa/rfc2445.c:699
+#: ../libbalsa/rfc2445.c:446
 msgid "Event Request"
 msgstr "Zahteva dogodka"
 
-#: ../libbalsa/rfc2445.c:700
+#: ../libbalsa/rfc2445.c:447
 msgid "Reply to Event Request"
 msgstr "Odgovori na zahtevo dogodka"
 
-#: ../libbalsa/rfc2445.c:701
+#: ../libbalsa/rfc2445.c:448
 msgid "Event Cancellation"
 msgstr "Preklic dogodka"
 
-#: ../libbalsa/rfc2445.c:717
-msgid "chair"
-msgstr "predsednik"
+#: ../libbalsa/rfc2445.c:468
+msgid "needs action"
+msgstr "zahteva dejanje"
 
-#: ../libbalsa/rfc2445.c:718
-msgid "required participant"
-msgstr "zahtevani udeleženi"
+#: ../libbalsa/rfc2445.c:469
+msgid "accepted"
+msgstr "sprejeto"
 
-#: ../libbalsa/rfc2445.c:719
-msgid "optional participant"
-msgstr "izbirni udeleženci"
+#: ../libbalsa/rfc2445.c:470
+msgid "declined"
+msgstr "odklonjeno"
 
-#: ../libbalsa/rfc2445.c:720
-msgid "non-participant, information only"
-msgstr "ne-udeleženci, le podatki"
+#: ../libbalsa/rfc2445.c:471
+msgid "tentatively accepted"
+msgstr "poskusno sprejeto"
 
-#: ../libbalsa/rfc3156.c:589 ../libbalsa/rfc3156.c:596
-msgid "decryption and signature verification failed"
-msgstr "dešifriranje in podpisovanje ni uspelo"
+#: ../libbalsa/rfc2445.c:472
+msgid "delegated"
+msgstr "pooblaščeno"
 
-#: ../libbalsa/rfc3156.c:622
-msgid "The signature is valid."
-msgstr "Podpis je veljaven."
+#: ../libbalsa/rfc2445.c:515
+msgid "Sunday"
+msgstr "nedelja"
 
-#: ../libbalsa/rfc3156.c:624
-msgid "The signature is valid but expired."
-msgstr "Podpis je veljaven, toda potekel."
+#: ../libbalsa/rfc2445.c:515
+msgid "Monday"
+msgstr "ponedeljek"
 
-#: ../libbalsa/rfc3156.c:627
-msgid ""
-"The signature is valid but the key used to verify the signature has expired."
-msgstr "Podpis je veljaven, toda ključ za preverjanje veljavnosti potekel."
+#: ../libbalsa/rfc2445.c:515
+msgid "Tuesday"
+msgstr "torek"
 
-#: ../libbalsa/rfc3156.c:630
-msgid ""
-"The signature is valid but the key used to verify the signature has been "
-"revoked."
-msgstr ""
-"Podpis je veljaven, vendar je bil ključ za preverjanje veljavnosti preklican."
+#: ../libbalsa/rfc2445.c:515
+msgid "Wednesday"
+msgstr "sreda"
 
-#: ../libbalsa/rfc3156.c:633
-msgid "The signature is invalid."
-msgstr "Podpis je neveljaven."
+#: ../libbalsa/rfc2445.c:515
+msgid "Thursday"
+msgstr "četrtek"
 
-#: ../libbalsa/rfc3156.c:636
-msgid "The signature could not be verified due to a missing key."
-msgstr "Podpisa ni mogoče preveriti zaradi manjkajočega ključa."
+#: ../libbalsa/rfc2445.c:515
+msgid "Friday"
+msgstr "petek"
 
-#: ../libbalsa/rfc3156.c:638
-msgid "This part is not a real PGP signature."
-msgstr "Ta del ni pravi podpis PGP."
+#: ../libbalsa/rfc2445.c:515
+msgid "Saturday"
+msgstr "sobota"
 
-#: ../libbalsa/rfc3156.c:641
-msgid "The signature could not be verified due to an invalid crypto engine."
-msgstr ""
-"Podpisa ni mogoče preveriti zaradi neveljavnega šifrirnega programnika."
+#: ../libbalsa/rfc2445.c:546
+msgid "every weekday"
+msgstr "vsak dan v tednu"
 
-#: ../libbalsa/rfc3156.c:644 ../libbalsa/rfc3156.c:894
-msgid "GnuPG is rebuilding the trust database and is currently unavailable."
-msgstr "GnuPG ponovno izgrajuje zbirko podatkov in je trenutno nedostopen."
+#: ../libbalsa/rfc2445.c:548
+msgid "every day"
+msgstr "vsak dan"
 
-#: ../libbalsa/rfc3156.c:650
-msgid "An error prevented the signature verification."
-msgstr "Napaka je preprečila preverjanje podpisa."
+#: ../libbalsa/rfc2445.c:550
+#, c-format
+msgid "every %d days"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:661
-msgid "The user ID is of unknown validity."
-msgstr "Veljavnost uporabnikovega ID ni znana."
+#: ../libbalsa/rfc2445.c:565
+#, fuzzy
+#| msgid "never"
+msgid "every "
+msgstr "nikoli"
 
-#: ../libbalsa/rfc3156.c:663
-msgid "The validity of the user ID is undefined."
-msgstr "Veljavnost uporabnikovega ID je nedoločena."
+#: ../libbalsa/rfc2445.c:567
+#, c-format
+msgid "every %d weeks on "
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:665
-msgid "The user ID is never valid."
-msgstr "Uporabniški ID ni nikoli veljaven."
+#: ../libbalsa/rfc2445.c:574 ../libbalsa/rfc2445.c:676
+#, c-format
+msgid " and %s"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:667
-msgid "The user ID is marginally valid."
-msgstr "Uporabniški ID je delno veljaven."
+#: ../libbalsa/rfc2445.c:579
+msgid "every week"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:669
-msgid "The user ID is fully valid."
-msgstr "Uporabniški ID je polno veljaven."
+#: ../libbalsa/rfc2445.c:581
+#, c-format
+msgid "every %d weeks"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:671
-msgid "The user ID is ultimately valid."
-msgstr "Uporabniški ID je popolno veljaven."
+#: ../libbalsa/rfc2445.c:592
+msgid "the last"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:673 ../libbalsa/rfc3156.c:695
-msgid "bad validity"
-msgstr "slaba veljavnost"
+#: ../libbalsa/rfc2445.c:599
+#, c-format
+msgid "%dst"
+msgstr "%d."
 
-#: ../libbalsa/rfc3156.c:685
-msgid "undefined"
-msgstr "nedoločeno"
+#: ../libbalsa/rfc2445.c:602
+#, c-format
+msgid "%dnd"
+msgstr "%d."
 
-#: ../libbalsa/rfc3156.c:689
-msgid "marginal"
-msgstr "delno"
+#: ../libbalsa/rfc2445.c:605
+#, c-format
+msgid "%drd"
+msgstr "%d."
 
-#: ../libbalsa/rfc3156.c:691
-msgid "full"
-msgstr "polno"
+#: ../libbalsa/rfc2445.c:608
+#, c-format
+msgid "%dth"
+msgstr "%d."
 
-#: ../libbalsa/rfc3156.c:693
-msgid "ultimate"
-msgstr "popolno"
+#: ../libbalsa/rfc2445.c:626
+msgid "every day of every month"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:705
-msgid "PGP signature: "
-msgstr "Podpis PGP: "
+#: ../libbalsa/rfc2445.c:628
+#, c-format
+msgid "every day of the month every %d months"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:707
-msgid "S/MIME signature: "
-msgstr "Podpis S/MIME: "
+#. currently we don't support yearly rules with more than one BYDAY element or exactly 7 elements with all 
the weekdays
+#. * (the "every day" case)
+#: ../libbalsa/rfc2445.c:643 ../libbalsa/rfc2445.c:687
+#: ../libbalsa/rfc2445.c:724 ../libbalsa/rfc2445.c:786
+#: ../libbalsa/rfc2445.c:791 ../libbalsa/rfc2445.c:794
+#, fuzzy
+#| msgid "Auto-complete"
+msgid "rule too complex"
+msgstr "Samodejno zaključevanje"
 
-#: ../libbalsa/rfc3156.c:709
-msgid "(unknown protocol) "
-msgstr "(neznan protokol)"
+#: ../libbalsa/rfc2445.c:649
+#, fuzzy, c-format
+#| msgid "never"
+msgid "every %s"
+msgstr "nikoli"
 
-#: ../libbalsa/rfc3156.c:737
-#, c-format
-msgid ""
-"\n"
-"Signature validity: %s"
+#: ../libbalsa/rfc2445.c:693
+msgid " and "
 msgstr ""
-"\n"
-"Veljavnost podpisa: %s"
 
-#: ../libbalsa/rfc3156.c:738
+#: ../libbalsa/rfc2445.c:704
+msgid " of every month"
+msgstr ""
+
+#: ../libbalsa/rfc2445.c:706
 #, c-format
-msgid ""
-"\n"
-"Signed on: %s"
+msgid " of every %d months"
 msgstr ""
-"\n"
-"Podpisano ob: %s"
 
-#: ../libbalsa/rfc3156.c:740
+#: ../libbalsa/rfc2445.c:717
+msgid "January"
+msgstr "januar"
+
+#: ../libbalsa/rfc2445.c:717
+msgid "February"
+msgstr "februar"
+
+#: ../libbalsa/rfc2445.c:717
+msgid "March"
+msgstr "marec"
+
+#: ../libbalsa/rfc2445.c:717
+msgid "April"
+msgstr "april"
+
+#: ../libbalsa/rfc2445.c:717
+msgid "May"
+msgstr "maj"
+
+#: ../libbalsa/rfc2445.c:717
+msgid "June"
+msgstr "junij"
+
+#: ../libbalsa/rfc2445.c:718
+msgid "July"
+msgstr "julij"
+
+#: ../libbalsa/rfc2445.c:718
+msgid "August"
+msgstr "avgust"
+
+#: ../libbalsa/rfc2445.c:718
+msgid "September"
+msgstr "september"
+
+#: ../libbalsa/rfc2445.c:718
+msgid "October"
+msgstr "oktober"
+
+#: ../libbalsa/rfc2445.c:718
+msgid "November"
+msgstr "november"
+
+#: ../libbalsa/rfc2445.c:718
+msgid "December"
+msgstr "december"
+
+#: ../libbalsa/rfc2445.c:746
 #, c-format
-msgid ""
-"\n"
-"Key fingerprint: %s"
+msgid "every %s %s"
 msgstr ""
-"\n"
-"Prstni odtis ključa: %s"
 
-#: ../libbalsa/rfc3156.c:765
+#: ../libbalsa/rfc2445.c:748
 #, c-format
-msgid ""
-"\n"
-"Key owner trust: %s"
+msgid "every %d years on %s %s"
 msgstr ""
-"\n"
-"Zaupanje lastniku ključa: %s"
 
-#: ../libbalsa/rfc3156.c:774
-#, fuzzy
-#| msgid ""
-#| "\n"
-#| "User ID's:"
-msgid ""
-"\n"
-"User IDs:"
-msgstr "Krajevni ID za ta stik ni zapisljiv."
+#: ../libbalsa/rfc2445.c:758
+#, c-format
+msgid "every day of %s"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:777
-msgid ""
-"\n"
-"User ID:"
+#: ../libbalsa/rfc2445.c:760
+#, c-format
+msgid "every %d years every day of %s"
 msgstr ""
-"\n"
-"ID uporabnika:"
 
-#: ../libbalsa/rfc3156.c:788
-msgid " [Revoked]"
-msgstr "[Preklicano]"
+#: ../libbalsa/rfc2445.c:770
+#, fuzzy, c-format
+#| msgid "%s on %s"
+msgid "every %s of %s"
+msgstr "%s na %s"
 
-#: ../libbalsa/rfc3156.c:790
-msgid " [Invalid]"
-msgstr "[Neveljavno]"
+#: ../libbalsa/rfc2445.c:772
+#, c-format
+msgid "every %d years on every %s of %s"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:817
+#: ../libbalsa/rfc2445.c:780
 #, c-format
-msgid ""
-"\n"
-"Subkey created on: %s"
+msgid "the %s of every %s"
 msgstr ""
-"\n"
-"Podključ je bil ustvarjen ob: %s"
 
-#: ../libbalsa/rfc3156.c:819
+#: ../libbalsa/rfc2445.c:782
 #, c-format
-msgid ""
-"\n"
-"Subkey expires on: %s"
+msgid "every %d years on the %s of %s"
+msgstr ""
+
+#: ../libbalsa/rfc2445.c:813
+msgid "secondly"
 msgstr ""
-"\n"
-"Podključ poteče ob: %s"
 
-#: ../libbalsa/rfc3156.c:828
-msgid " revoked"
-msgstr " preklicano"
+#: ../libbalsa/rfc2445.c:816
+#, fuzzy
+#| msgid "minutes"
+msgid "minutely"
+msgstr "minut"
 
-#: ../libbalsa/rfc3156.c:833
-msgid " expired"
-msgstr " pretečeno"
+#: ../libbalsa/rfc2445.c:819
+msgid "hourly"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:838
-msgid " disabled"
-msgstr " onemogočeno"
+#: ../libbalsa/rfc2445.c:840
+msgid "occurrence"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:843
-msgid " invalid"
-msgstr " neveljavno"
+#: ../libbalsa/rfc2445.c:840
+#, fuzzy
+#| msgid "Prefere_nces"
+msgid "occurrences"
+msgstr "Mož_nosti"
 
-#. ngettext: string begins with a single space, so no space
-#. * after the colon is correct punctuation (in English).
-#: ../libbalsa/rfc3156.c:847
+#: ../libbalsa/rfc2445.c:845
 #, c-format
+msgid " until %s"
+msgstr ""
+
+#: ../libbalsa/rfc2445.c:1121
+msgid "chair"
+msgstr "predsednik"
+
+#: ../libbalsa/rfc2445.c:1122
+msgid "required participant"
+msgstr "zahtevani udeleženi"
+
+#: ../libbalsa/rfc2445.c:1123
+msgid "optional participant"
+msgstr "izbirni udeleženci"
+
+#: ../libbalsa/rfc2445.c:1124
+msgid "non-participant, information only"
+msgstr "ne-udeleženci, le podatki"
+
+#: ../libbalsa/rfc3156.c:596 ../libbalsa/rfc3156.c:603
+msgid "decryption and signature verification failed"
+msgstr "dešifriranje in podpisovanje ni uspelo"
+
+#: ../libbalsa/rfc3156.c:629
+msgid "The signature is valid."
+msgstr "Podpis je veljaven."
+
+#: ../libbalsa/rfc3156.c:631
+msgid "The signature is valid but expired."
+msgstr "Podpis je veljaven, toda potekel."
+
+#: ../libbalsa/rfc3156.c:633
 msgid ""
-"\n"
-"Subkey attribute:%s"
-msgid_plural ""
-"\n"
-"Subkey attributes:%s"
-msgstr[0] ""
-"\n"
-"Atributi podključa:%s"
-msgstr[1] ""
-"\n"
-"Atributi podključa:%s"
-msgstr[2] ""
-"\n"
-"Atributi podključa:%s"
-msgstr[3] ""
-"\n"
-"Atributi podključa:%s"
+"The signature is valid but the key used to verify the signature has expired."
+msgstr "Podpis je veljaven, toda ključ za preverjanje veljavnosti potekel."
 
-#: ../libbalsa/rfc3156.c:859
-#, c-format
+#: ../libbalsa/rfc3156.c:635
 msgid ""
-"\n"
-"Issuer name: %s"
+"The signature is valid but the key used to verify the signature has been "
+"revoked."
 msgstr ""
-"\n"
-"Ime izdajatelja: %s"
+"Podpis je veljaven, vendar je bil ključ za preverjanje veljavnosti preklican."
 
-#: ../libbalsa/rfc3156.c:863
-#, c-format
-msgid ""
-"\n"
-"Issuer serial number: %s"
+#: ../libbalsa/rfc3156.c:637
+msgid "The signature is invalid."
+msgstr "Podpis je neveljaven."
+
+#: ../libbalsa/rfc3156.c:639
+msgid "The signature could not be verified due to a missing key."
+msgstr "Podpisa ni mogoče preveriti zaradi manjkajočega ključa."
+
+#: ../libbalsa/rfc3156.c:641
+#, fuzzy
+#| msgid "This part is not a real PGP signature."
+msgid "This part is not a real signature."
+msgstr "Ta del ni pravi podpis PGP."
+
+#: ../libbalsa/rfc3156.c:643
+msgid "The signature could not be verified due to an invalid crypto engine."
 msgstr ""
-"\n"
-"Zaporedna številka izdajatelja: %s"
+"Podpisa ni mogoče preveriti zaradi neveljavnega šifrirnega programnika."
 
-#: ../libbalsa/rfc3156.c:866
-#, c-format
-msgid ""
-"\n"
-"Chain ID: %s"
+#: ../libbalsa/rfc3156.c:645 ../libbalsa/rfc3156.c:725
+msgid "GnuPG is rebuilding the trust database and is currently unavailable."
+msgstr "GnuPG ponovno izgrajuje zbirko podatkov in je trenutno nedostopen."
+
+#: ../libbalsa/rfc3156.c:647
+msgid "The signature contains multiple signers, this may be a forgery."
 msgstr ""
-"\n"
-"ID verige: %s"
 
-#: ../libbalsa/rfc3156.c:895
+#: ../libbalsa/rfc3156.c:653
+#, fuzzy, c-format
+#| msgid "An error prevented the signature verification."
+msgid "An error prevented the signature verification: %s: %s"
+msgstr "Napaka je preprečila preverjanje podpisa."
+
+#: ../libbalsa/rfc3156.c:655
+#, fuzzy, c-format
+#| msgid "An error prevented the signature verification."
+msgid "An error prevented the signature verification: %s"
+msgstr "Napaka je preprečila preverjanje podpisa."
+
+#: ../libbalsa/rfc3156.c:667
+msgid "The user ID is of unknown validity."
+msgstr "Veljavnost uporabnikovega ID ni znana."
+
+#: ../libbalsa/rfc3156.c:669
+msgid "The validity of the user ID is undefined."
+msgstr "Veljavnost uporabnikovega ID je nedoločena."
+
+#: ../libbalsa/rfc3156.c:671
+msgid "The user ID is never valid."
+msgstr "Uporabniški ID ni nikoli veljaven."
+
+#: ../libbalsa/rfc3156.c:673
+msgid "The user ID is marginally valid."
+msgstr "Uporabniški ID je delno veljaven."
+
+#: ../libbalsa/rfc3156.c:675
+msgid "The user ID is fully valid."
+msgstr "Uporabniški ID je polno veljaven."
+
+#: ../libbalsa/rfc3156.c:677
+msgid "The user ID is ultimately valid."
+msgstr "Uporabniški ID je popolno veljaven."
+
+#: ../libbalsa/rfc3156.c:679 ../libbalsa/rfc3156.c:701
+msgid "bad validity"
+msgstr "slaba veljavnost"
+
+#: ../libbalsa/rfc3156.c:691
+msgid "undefined"
+msgstr "nedoločeno"
+
+#: ../libbalsa/rfc3156.c:695
+msgid "marginal"
+msgstr "delno"
+
+#: ../libbalsa/rfc3156.c:697
+msgid "full"
+msgstr "polno"
+
+#: ../libbalsa/rfc3156.c:699
+msgid "ultimate"
+msgstr "popolno"
+
+#: ../libbalsa/rfc3156.c:726
 msgid "Try again later."
 msgstr "Poskusite znova kasneje."
 
@@ -2168,7 +2676,7 @@ msgstr "Izmaličena vrstica stanja"
 msgid "malformed line “%s”, empty name or value"
 msgstr ""
 
-#: ../libbalsa/send.c:206
+#: ../libbalsa/send.c:214
 #, c-format
 msgid "SMTP server %s"
 msgstr "Strežnik SMTP %s"
@@ -2179,29 +2687,27 @@ msgstr "Strežnik SMTP %s"
 msgid "Message %u of %u"
 msgstr "%u od %u"
 
-#: ../libbalsa/send.c:650
+#: ../libbalsa/send.c:648
 #, c-format
 msgid "Cannot reach SMTP server %s (%s), any queued message will remain in %s."
 msgstr ""
 
-#: ../libbalsa/send.c:840
-#, fuzzy
-#| msgid "Sending Mail..."
+#: ../libbalsa/send.c:859
 msgid "Sending Mail"
-msgstr "Prišlo je do napake med pošiljanjem sporočila. Sporočilo ni poslano."
+msgstr "Poteka pošiljanje sporočila"
 
-#: ../libbalsa/send.c:946
+#: ../libbalsa/send.c:969
 #, fuzzy, c-format
 #| msgid "Save this message and close"
 msgid "Save message in %s…"
 msgstr "Ni mogoče shraniti sporočila."
 
-#: ../libbalsa/send.c:954
+#: ../libbalsa/send.c:977
 #, c-format
 msgid "Saving sent message to %s failed: %s"
 msgstr "Shranjevanje poslanega sporočila v %s ni uspelo: %s"
 
-#: ../libbalsa/send.c:985
+#: ../libbalsa/send.c:1013
 #, fuzzy, c-format
 #| msgid ""
 #| "Relaying refused:\n"
@@ -2215,25 +2721,13 @@ msgstr ""
 "%d: %s\n"
 "Sporočilo je ostalo v odhodnem predalu.\n"
 
-#: ../libbalsa/send.c:1006
-#, fuzzy, c-format
-#| msgid "Reading embedded message failed: %s"
-msgid "Sending queued messages to %s"
-msgstr "Pošiljanje podatkov na %s"
-
-#: ../libbalsa/send.c:1014
-#, fuzzy, c-format
-#| msgid "Connected to MTA"
-msgid "Connected to %s"
-msgstr "Ni povezave s %s"
-
-#: ../libbalsa/send.c:1068
+#: ../libbalsa/send.c:1124
 #, fuzzy, c-format
 #| msgid "Scanning of %s failed: %s"
 msgid "Connecting SMTP server %s (%s) failed: %s"
 msgstr "Povezava s strežnikom SMTP %s v varnem načinu je spodletela: %s"
 
-#: ../libbalsa/send.c:1091
+#: ../libbalsa/send.c:1143
 #, fuzzy, c-format
 #| msgid "Forward message to %s: %s"
 msgid "Transmitted %u message to %s"
@@ -2243,17 +2737,17 @@ msgstr[1] "Posreduj sporočilo osebi %s: %s"
 msgstr[2] "Posreduj sporočilo osebi %s: %s"
 msgstr[3] "Posreduj sporočilo osebi %s: %s"
 
-#: ../libbalsa/send.c:1263 ../libbalsa/send.c:1329
+#: ../libbalsa/send.c:1308 ../libbalsa/send.c:1376
 #, c-format
 msgid "Cannot read %s: %s"
 msgstr "Ni mogoče prebrati %s: %s"
 
-#: ../libbalsa/send.c:1266 ../libbalsa/send.c:1332
+#: ../libbalsa/send.c:1311 ../libbalsa/send.c:1379
 #, c-format
 msgid "Cannot read %s"
 msgstr "Ni mogoče prebrati %s"
 
-#: ../libbalsa/send.c:1296
+#: ../libbalsa/send.c:1343
 #, fuzzy, c-format
 #| msgid ""
 #| "Cannot determine charset for text file `%s'; sending as mime type `%s'"
@@ -2263,7 +2757,7 @@ msgstr ""
 "Ni mogoče določiti nabora znakov za datoteko `%s'; pošiljanje kot mime vrsta "
 "`%s'"
 
-#: ../libbalsa/send.c:1731
+#: ../libbalsa/send.c:1871 ../libbalsa/send.c:1969
 msgid "This message will not be encrypted for the BCC: recipient."
 msgid_plural "This message will not be encrypted for the BCC: recipients."
 msgstr[0] "Sporočilo ne bo šifrirano za prejemnike BCC:."
@@ -2271,148 +2765,197 @@ msgstr[1] "Sporočilo ne bo šifrirano za prejemnika BCC:."
 msgstr[2] "Sporočilo ne bo šifrirano za prejemnika BCC:."
 msgstr[3] "Sporočilo ne bo šifrirano za prejemnike BCC:."
 
-#: ../libbalsa/send.c:1826
-msgid "This message will not be encrypted for the BCC: recipient(s)."
-msgstr "Sporočilo ne bo šifrirano za prejemnike SKP:."
+#: ../libbalsa/server.c:332
+msgid "Balsa passwords"
+msgstr "Gesla Balsa"
 
-#. host, authentication method
-#: ../libbalsa/server.c:537
-#, c-format
-msgid "Logging in to %s using %s"
-msgstr "Prijavljanje v %s z %s"
+#: ../libbalsa/server.c:338
+#, fuzzy, c-format
+#| msgid "Error showing %s: %s\n"
+msgid "Error storing password for %s@%s:%s: %s"
+msgstr "Napaka pri shranjevanju šifrirnega gesla v zbirki ključev (%s)"
 
-#: ../libbalsa/smtp-server.c:298
-#, fuzzy
-msgid "SMTP over SSL (SMTPS)"
-msgstr "SMTP preko SSL"
+#: ../libbalsa/server.c:360
+#, fuzzy, c-format
+#| msgid "Error loading %s: %s\n"
+msgid "Error looking up password for %s@%s:%s: %s"
+msgstr "Napaka med iskanjem bločne naprave za %s"
 
-#: ../libbalsa/smtp-server.c:299 ../libinit_balsa/assistant_page_user.c:69
-#: ../src/mailbox-conf.c:1295
-#, fuzzy
-#| msgid "Required"
-msgid "TLS required"
-msgstr "Strežnik zahteva potrdilo TLS"
+#: ../libbalsa/server.c:366
+msgid "loaded fallback password from private config file"
+msgstr ""
 
-#: ../libbalsa/smtp-server.c:300 ../libinit_balsa/assistant_page_user.c:70
-#: ../src/mailbox-conf.c:1296
+#: ../libbalsa/server-config.c:75
 #, fuzzy
-msgid "TLS if possible (not recommended)"
-msgstr "TLS"
+#| msgid "_Remember password in keyring"
+msgid "_Remember user password in Secret Service"
+msgstr "Za_pomni si geslo"
 
-#: ../libbalsa/smtp-server.c:301 ../libinit_balsa/assistant_page_user.c:71
-#: ../src/mailbox-conf.c:1297
+#: ../libbalsa/server-config.c:76
 #, fuzzy
-msgid "None (not recommended)"
-msgstr "_Brez"
+#| msgid "_Remember password in keyring"
+msgid "_Remember certificate pass phrase in Secret Service"
+msgstr "Za_pomni si geslo"
 
-#: ../libbalsa/smtp-server.c:332
-#, c-format
-msgid "Error displaying server help: %s\n"
-msgstr "Napaka med prikazovanjem pomoči strežnika: %s\n"
+#: ../libbalsa/server-config.c:80
+#, fuzzy
+#| msgid "_Remember your password:"
+msgid "_Remember user password"
+msgstr "_Zapomni si geslo:"
 
-#: ../libbalsa/smtp-server.c:467
-msgid "SMTP Server"
-msgstr "Strežnik SMTP"
+#: ../libbalsa/server-config.c:81
+#, fuzzy
+#| msgid "C_ertificate Pass Phrase:"
+msgid "_Remember certificate pass phrase"
+msgstr "_Šifrirno geslo:"
 
-#: ../libbalsa/smtp-server.c:497 ../src/folder-conf.c:336
-#: ../src/mailbox-conf.c:1278 ../src/mailbox-conf.c:1391
+#: ../libbalsa/server-config.c:103
 msgid "_Basic"
 msgstr "_Osnovno"
 
-#: ../libbalsa/smtp-server.c:502
+#. server descriptive name
+#: ../libbalsa/server-config.c:106
 msgid "_Descriptive Name:"
 msgstr "Opisno _ime:"
 
-#. pop server
-#. imap server
-#: ../libbalsa/smtp-server.c:510 ../src/folder-conf.c:384
-#: ../src/mailbox-conf.c:1285 ../src/mailbox-conf.c:1400
+#. host and port
+#: ../libbalsa/server-config.c:110
 msgid "_Server:"
 msgstr "_Strežnik:"
 
-#. security
-#: ../libbalsa/smtp-server.c:518 ../src/mailbox-conf.c:1290
-#, fuzzy
-#| msgid "Security"
+#: ../libbalsa/server-config.c:116
 msgid "Se_curity:"
-msgstr "Std. nap."
+msgstr "_Varnost:"
 
-#. authentication or anonymous access
-#: ../libbalsa/smtp-server.c:522
-msgid "Server requires authentication"
+#: ../libbalsa/server-config.c:123
+#, fuzzy
+#| msgid "Server requires authentication"
+msgid "Server requires _authentication"
 msgstr "Strežnik zahteva overitev"
 
-#: ../libbalsa/smtp-server.c:523
-msgid "_Authentication:"
-msgstr "_Overitev:"
-
-#: ../libbalsa/smtp-server.c:529
+#. user name and password
+#: ../libbalsa/server-config.c:129
 msgid "_User Name:"
 msgstr "_Uporabniško ime:"
 
-#: ../libbalsa/smtp-server.c:536
+#: ../libbalsa/server-config.c:133
 msgid "_Pass Phrase:"
 msgstr "_Šifrirno geslo:"
 
-#: ../libbalsa/smtp-server.c:549 ../src/folder-conf.c:374
-#: ../src/mailbox-conf.c:1329 ../src/mailbox-conf.c:1456
+#: ../libbalsa/server-config.c:146
 msgid "_Advanced"
 msgstr "_Napredno"
 
 #. client certificate and passphrase
-#. client certificate configuration
-#: ../libbalsa/smtp-server.c:552 ../src/mailbox-conf.c:264
+#: ../libbalsa/server-config.c:149
 #, fuzzy
-msgid "Server requires client certificate"
+msgid "Server _requires client certificate"
 msgstr "Potrdilo za overitev odjemalca"
 
-#: ../libbalsa/smtp-server.c:553
-#, fuzzy
-msgid "_Client Certificate:"
-msgstr "Potrdilo odjemalca X.509"
-
-#: ../libbalsa/smtp-server.c:557 ../src/mailbox-conf.c:267
+#: ../libbalsa/server-config.c:152
 #, fuzzy
 msgid "Choose Client Certificate"
-msgstr "Potrdilo odjemalca X.509"
+msgstr "Izbor potrdila pooblastitelja"
 
-#: ../libbalsa/smtp-server.c:559 ../src/mailbox-conf.c:266
-#, fuzzy
-#| msgid "C_ertificate Pass Phrase:"
+#: ../libbalsa/server-config.c:153
 msgid "Certificate _File:"
-msgstr ""
-"To datoteko potrdila X.509 (oblika PEM) se lahko uporablja tudi za overitev "
-"oddaljenih odjemalcev v sejah TLS."
+msgstr "_Datoteka potrdila:"
 
-#: ../libbalsa/smtp-server.c:566 ../src/mailbox-conf.c:272
-#, fuzzy
-#| msgid "C_ertificate Pass Phrase:"
+#: ../libbalsa/server-config.c:161
 msgid "Certificate _Pass Phrase:"
-msgstr "_Šifrirno geslo:"
+msgstr "_Šifrirno geslo potrdila:"
+
+#: ../libbalsa/server-config.c:371
+#, fuzzy, c-format
+#| msgid "SMTP over SSL (SMTPS)"
+msgid "%s over SSL (%sS)"
+msgstr "SMTP prek SSL (SMTPS)"
+
+#: ../libbalsa/server-config.c:375 ../libinit_balsa/assistant_page_user.c:69
+msgid "TLS required"
+msgstr "Zahtevan TLS"
+
+#: ../libbalsa/server-config.c:376 ../libinit_balsa/assistant_page_user.c:70
+msgid "TLS if possible (not recommended)"
+msgstr "TLS, če je mogoče (ni priporočljivo)"
+
+#: ../libbalsa/server-config.c:377 ../libinit_balsa/assistant_page_user.c:71
+msgid "None (not recommended)"
+msgstr "Brez (ni priporočljivo)"
+
+#: ../libbalsa/smtp-server.c:246
+#, c-format
+msgid "Error displaying server help: %s\n"
+msgstr "Napaka med prikazovanjem pomoči strežnika: %s\n"
+
+#: ../libbalsa/smtp-server.c:322
+msgid "SMTP Server"
+msgstr "Strežnik SMTP"
 
 #. split large messages
-#: ../libbalsa/smtp-server.c:575
+#: ../libbalsa/smtp-server.c:348
 msgid "Sp_lit message larger than"
 msgstr "Ra_zdeli sporočilo večje kot"
 
-#: ../libbalsa/smtp-server.c:580 ../src/pref-manager.c:2186
+#: ../libbalsa/smtp-server.c:352 ../src/pref-manager.c:2168
 msgid "MB"
 msgstr "MB"
 
-#: ../libbalsa/source-viewer.c:128
+#: ../libbalsa/source-viewer.c:129
 msgid "Mailbox closed"
 msgstr "Poštni predal je zaprt"
 
-#: ../libbalsa/source-viewer.c:238
+#: ../libbalsa/source-viewer.c:220
 msgid "Message Source"
 msgstr "Izvorna koda sporočila"
 
-#: ../libbalsa/source-viewer.c:250 ../src/main-window.c:2068
-#: ../src/message-window.c:848
+#: ../libbalsa/source-viewer.c:230 ../src/message-window.c:856
 #, fuzzy, c-format
 #| msgid "Error loading %s: %s\n"
 msgid "Error adding from %s: %s\n"
-msgstr "Napaka med dodajanjem “%s”: %s"
+msgstr "Napaka med dodajanjem stika: %s"
+
+#: ../libbalsa/x509-cert-widget.c:134
+msgid "Broken key, cannot identify certificate chain."
+msgstr ""
+
+#: ../libbalsa/x509-cert-widget.c:280
+#, c-format
+msgid "fingerprint %s"
+msgstr "prstni odtis %s"
+
+#: ../libbalsa/x509-cert-widget.c:281
+#, fuzzy, c-format
+msgid "cannot load key with fingerprint %s: %s"
+msgstr "Na tem mestu ni mogoče najti ključa »%s«."
+
+#: ../libbalsa/x509-cert-widget.c:482
+msgid ""
+"\n"
+"<b>This certificate was issued by:</b>\n"
+msgstr ""
+"\n"
+"<b>Potrdilo je izdal:</b>\n"
+
+#: ../libbalsa/x509-cert-widget.c:491
+#, fuzzy, c-format
+#| msgid ""
+#| "<b>This certificate is valid</b>\n"
+#| "from %s\n"
+#| "to %s\n"
+#| "<b>Fingerprint:</b> %s"
+msgid ""
+"<b>This certificate is valid</b>\n"
+"from %s\n"
+"to %s\n"
+"<b>Fingerprint:</b>\n"
+"SHA1: %s\n"
+"SHA256: %s"
+msgstr ""
+"<b>To potrdilo je veljavno</b>\n"
+"od %s\n"
+"do %s\n"
+"<b>Prstni odtis:</b> %s"
 
 #: ../libinit_balsa/assistant_helper.c:177
 #, c-format
@@ -2437,7 +2980,7 @@ msgstr ""
 #, fuzzy, c-format
 #| msgid "The file with pathname \"%s\" is not a directory."
 msgid "The file with pathname “%s” is not a directory."
-msgstr "Pot '%s' ni absolutna pot"
+msgstr "Pot »%s« ni absolutna pot"
 
 #: ../libinit_balsa/assistant_helper.c:215
 #, fuzzy, c-format
@@ -2517,26 +3060,26 @@ msgstr "Ime poti \"%s\" mora biti določeno absolutno -- začeti se mora s '/'."
 msgid "Could not create mailbox at path “%s”\n"
 msgstr "Ni mogoče ustvariti poštnega predala vrste %s"
 
-#: ../libinit_balsa/assistant_page_directory.c:155
+#: ../libinit_balsa/assistant_page_directory.c:161
 #, fuzzy, c-format
 #| msgid "The mailbox \"%s\" does not appear to be valid."
 msgid "The mailbox “%s” does not appear to be valid."
 msgstr "Poštni predal %s ni videti kot poštni predal v obliki Maildir."
 
-#: ../libinit_balsa/assistant_page_directory.c:189
+#: ../libinit_balsa/assistant_page_directory.c:195
 #, fuzzy, c-format
 msgid ""
 "Problem verifying path “%s”:\n"
 "%s"
-msgstr "Preverjanje nadzorne vsote"
+msgstr "Preverjanje nadzorne vsote »%s«"
 
-#: ../libinit_balsa/assistant_page_directory.c:222
+#: ../libinit_balsa/assistant_page_directory.c:228
 #, fuzzy
 #| msgid "Other options"
 msgid "_Verify locations"
-msgstr "_Preveri"
+msgstr "&Preveri"
 
-#: ../libinit_balsa/assistant_page_directory.c:256
+#: ../libinit_balsa/assistant_page_directory.c:262
 #, fuzzy
 #| msgid ""
 #| "Please verify the locations of your default mail files.\n"
@@ -2548,7 +3091,7 @@ msgstr ""
 "Preverite mesta privzetih datotek s pošto.\n"
 "Če je treba, bodo ustvarjene."
 
-#: ../libinit_balsa/assistant_page_directory.c:320
+#: ../libinit_balsa/assistant_page_directory.c:326
 msgid "Mail Files"
 msgstr "Datoteke s pošto"
 
@@ -2615,7 +3158,7 @@ msgstr "_Vrsta poštnega strežnika:"
 #: ../libinit_balsa/assistant_page_user.c:114
 #, fuzzy
 #| msgid "Connect using _SSL:"
-msgid "Connection _Security"
+msgid "Connection _Security:"
 msgstr "Varnost:"
 
 #: ../libinit_balsa/assistant_page_user.c:118
@@ -2639,7 +3182,7 @@ msgstr "Pravo _ime:"
 #, fuzzy
 #| msgid "Your _Email Address, for this email account:"
 msgid "Your _email address for this email account:"
-msgstr "Elektronski naslov ali pa opomnik namena izbranega ključa."
+msgstr "Elektronski naslov ni zapisan na veljaven način"
 
 #: ../libinit_balsa/assistant_page_user.c:143
 msgid "_Remember your password:"
@@ -2653,11 +3196,11 @@ msgstr "_Krajevna poštna mapa:"
 msgid "User Settings"
 msgstr "Uporabniške nastavitve"
 
-#: ../libinit_balsa/assistant_page_user.c:293
+#: ../libinit_balsa/assistant_page_user.c:287
 msgid "Default Identity"
 msgstr "Privzeta istovetnost"
 
-#: ../libinit_balsa/assistant_page_user.c:331
+#: ../libinit_balsa/assistant_page_user.c:325
 #, c-format
 msgid ""
 "Local Mail Problem\n"
@@ -2698,104 +3241,109 @@ msgstr ""
 "\n"
 "-- ali pa je računalnik neposredno povezan v omrežje."
 
-#: ../libnetclient/net-client.c:78 ../libnetclient/net-client.c:116
+#: ../libnetclient/net-client.c:104 ../libnetclient/net-client.c:145
 #, c-format
 msgid "network client is already connected"
 msgstr ""
 
-#: ../libnetclient/net-client.c:155 ../libnetclient/net-client.c:198
+#: ../libnetclient/net-client.c:265 ../libnetclient/net-client.c:311
 #, fuzzy, c-format
 msgid "network client is not connected"
-msgstr "Povezano"
+msgstr "povezano.\n"
 
-#: ../libnetclient/net-client.c:166
+#: ../libnetclient/net-client.c:276
 #, c-format
 msgid "reply length %lu exceeds the maximum allowed length %lu"
 msgstr ""
 
-#: ../libnetclient/net-client.c:181
+#: ../libnetclient/net-client.c:292
 #, fuzzy, c-format
 msgid "connection lost"
 msgstr "Izgubljeno"
 
-#: ../libnetclient/net-client.c:229
+#: ../libnetclient/net-client.c:344
 #, fuzzy, c-format
 msgid "line too long"
-msgstr "Ime je predolgo"
+msgstr "Žal je bil prihod prepozen!"
 
-#: ../libnetclient/net-client.c:298
+#: ../libnetclient/net-client.c:415
 #, fuzzy, c-format
 #| msgid "Error printing message: %s"
 msgid "error initializing certificate: %s"
 msgstr "Napaka med nastavljanjem začetnih vrednosti potrdila X509: %s\n"
 
-#: ../libnetclient/net-client.c:308
+#: ../libnetclient/net-client.c:425
 #, fuzzy, c-format
 #| msgid "Error loading Face: %s"
 msgid "error loading certificate: %s"
 msgstr "Napaka med nalaganjem ponudnika '%s': %s"
 
-#: ../libnetclient/net-client.c:316
+#: ../libnetclient/net-client.c:433
 #, fuzzy, c-format
 #| msgid "Error printing message: %s"
 msgid "error initializing key: %s"
 msgstr "Napaka med začenjanjem Avahi: %s"
 
-#: ../libnetclient/net-client.c:372
+#: ../libnetclient/net-client.c:493
 #, fuzzy, c-format
 #| msgid "Error loading Face: %s"
 msgid "error loading key: %s"
 msgstr "Napaka med nalaganjem Face: %s"
 
-#: ../libnetclient/net-client.c:412
+#: ../libnetclient/net-client.c:535 ../libnetclient/net-client.c:574
 #, fuzzy, c-format
 #| msgid "Disconnected"
 msgid "not connected"
-msgstr "povezano.\n"
+msgstr "Brez povezave."
 
-#: ../libnetclient/net-client.c:414
+#: ../libnetclient/net-client.c:537
 #, fuzzy, c-format
 msgid "connection is already encrypted"
 msgstr "Povezava je že odprta"
 
+#: ../libnetclient/net-client.c:576
+#, fuzzy, c-format
+msgid "connection is already compressed"
+msgstr "Povezava je že odprta"
+
 #. unexpected server reply
-#: ../libnetclient/net-client-pop.c:214 ../libnetclient/net-client-pop.c:431
-#: ../libnetclient/net-client-smtp.c:586 ../libnetclient/net-client-smtp.c:657
-#: ../libnetclient/net-client-smtp.c:699
+#: ../libnetclient/net-client-pop.c:231 ../libnetclient/net-client-pop.c:450
+#: ../libnetclient/net-client-smtp.c:600 ../libnetclient/net-client-smtp.c:671
+#: ../libnetclient/net-client-smtp.c:718
 #, fuzzy, c-format
 #| msgid "Mail server: %s\n"
 msgid "bad server reply: %s"
-msgstr "Strežnik je vrnil nepopoln odgovor »%s«."
+msgstr "Neustrezen odziv posredniškega strežnika HTTP"
 
-#: ../libnetclient/net-client-pop.c:253
+#: ../libnetclient/net-client-pop.c:270
 #, fuzzy, c-format
 msgid "bad server reply"
 msgstr "Strežnik je vrnil izmaličen odgovor."
 
-#: ../libnetclient/net-client-pop.c:423 ../libnetclient/net-client-pop.c:702
+#: ../libnetclient/net-client-pop.c:442 ../libnetclient/net-client-pop.c:723
 #, c-format
 msgid "error: %s"
 msgstr "napaka: %s"
 
-#: ../libnetclient/net-client-pop.c:426
+#: ../libnetclient/net-client-pop.c:445
 #, c-format
 msgid "error"
 msgstr "napaka"
 
-#: ../libnetclient/net-client-pop.c:489 ../libnetclient/net-client-smtp.c:396
-#, fuzzy, c-format
-#| msgid "Password needed"
-msgid "password required"
-msgstr "Zahtevano je geslo"
-
-#: ../libnetclient/net-client-pop.c:508 ../libnetclient/net-client-smtp.c:411
+#: ../libnetclient/net-client-pop.c:509 ../libnetclient/net-client-smtp.c:413
 #, fuzzy, c-format
 msgid "no suitable authentication mechanism"
 msgstr ""
-"Prijava na strežnik \"%s\" je spodletela. Ustreznega načina overitve ni "
-"mogoče najti."
+"Prijava na strežnik »%s« je spodletela. Ustreznega načina overitve ni mogoče "
+"najti."
+
+#: ../libnetclient/net-client-pop.c:511 ../libnetclient/net-client-smtp.c:415
+#, fuzzy, c-format
+#| msgid "Password needed"
+msgid "password required"
+msgstr "Zahtevano geslo"
 
-#: ../libnetclient/net-client-smtp.c:142
+#: ../libnetclient/net-client-smtp.c:146
 #, fuzzy, c-format
 #| msgid ""
 #| "\n"
@@ -2803,98 +3351,108 @@ msgstr ""
 msgid "remote server does not support STARTTLS"
 msgstr "Strežnik ne podpira protokola STARTTLS"
 
-#: ../libnetclient/net-client-smtp.c:689
+#: ../libnetclient/net-client-smtp.c:703
 #, fuzzy, c-format
 #| msgid "Sending error: %s"
 msgid "transient error %d: %s"
 msgstr "Napaka v vrstici %d: %s"
 
-#: ../libnetclient/net-client-smtp.c:694
+#: ../libnetclient/net-client-smtp.c:709
+#, fuzzy, c-format
+#| msgid "_Authentication:"
+msgid "authentication failure %d: %s"
+msgstr "_Overitev:"
+
+#: ../libnetclient/net-client-smtp.c:712
 #, fuzzy, c-format
 #| msgid "Sending error: %s"
 msgid "permanent error %d: %s"
 msgstr "Napaka v vrstici %d: %s"
 
-#: ../libnetclient/net-client-utils.c:143
+#: ../libnetclient/net-client-utils.c:155
 #, fuzzy, c-format
 #| msgid "Removing duplicates failed: %s"
 msgid "importing GSS service name %s failed: %s"
 msgstr "Odstranjevanje dvojnikov ni uspelo: %s"
 
-#: ../libnetclient/net-client-utils.c:186
+#: ../libnetclient/net-client-utils.c:199
 #, c-format
 msgid "cannot initialize GSS security context: %s"
-msgstr ""
+msgstr "ni mogoče začeti varnostne vsebine GSS: %s"
 
-#: ../libnetclient/net-client-utils.c:225
+#: ../libnetclient/net-client-utils.c:239
 #, c-format
 msgid "malformed GSS security token: %s"
-msgstr ""
+msgstr "nepravilno oblikovan varnostni žeton GSS: %s"
 
-#: ../libnetclient/net-client-utils.c:234
+#: ../libnetclient/net-client-utils.c:248
 #, c-format
 msgid "malformed GSS security token"
-msgstr ""
+msgstr "nepravilno oblikovan varnostni žeton GSS"
 
-#: ../libnetclient/net-client-utils.c:250
+#: ../libnetclient/net-client-utils.c:265
 #, c-format
 msgid "cannot create GSS login request: %s"
-msgstr ""
+msgstr "ni mogoče ustvariti zahteve prijave GSS: %s"
 
-#: ../libnetclient/net-client-utils.c:315
+#: ../libnetclient/net-client-utils.c:330
 #, fuzzy, c-format
 #| msgid "unknown error"
 msgid "unknown error code %u:%u"
 msgstr "Koda napake %u med poizvedovanjem vnosa: %s"
 
 #: ../sounds/balsa.soundlist.in.h:1
-#, fuzzy
-#| msgid "Balsa E-mail reader"
 msgid "Balsa Email Reader"
-msgstr "Balsa"
+msgstr "Poštni odjemalec Balsa"
 
 #: ../sounds/balsa.soundlist.in.h:2
 #, fuzzy
 #| msgid "Program startup"
 msgid "Program start-up"
-msgstr ""
-"Programa ni mogoče začeti:\n"
-"%s"
+msgstr "Zaženi razhroščevalnik in naloži program"
 
 #: ../sounds/balsa.soundlist.in.h:3
 msgid "New mail notification"
 msgstr "Obvestilo o prispeli pošti"
 
-#: ../src/ab-main.c:212 ../src/ab-window.c:702
+#: ../src/ab-main.c:218 ../src/ab-window.c:707
 msgid " address book: "
 msgstr " imenik:"
 
-#: ../src/ab-main.c:744
+#: ../src/ab-main.c:736
 msgid "_Name"
 msgstr "_Ime"
 
-#: ../src/ab-main.c:760
+#: ../src/ab-main.c:752
 msgid "_Address"
 msgstr "_Naslov"
 
-#: ../src/ab-main.c:848 ../src/address-book-config.c:226
-#: ../src/address-book-config.c:331 ../src/address-book-config.c:375
-#: ../src/filter-edit-dialog.c:498 ../src/main-window.c:3970
-#: ../src/pref-manager.c:3297
+#: ../src/ab-main.c:840 ../src/address-book-config.c:229
+#: ../src/address-book-config.c:335 ../src/address-book-config.c:379
+#: ../src/filter-edit-dialog.c:500 ../src/main-window.c:3840
+#: ../src/pref-manager.c:3259
 msgid "_Apply"
 msgstr "_Uveljavi"
 
-#: ../src/ab-main.c:886
+#: ../src/ab-main.c:878
 msgid "F_ilter:"
 msgstr "_Filter:"
 
+#: ../src/ab-main.c:961
+msgid "Browse"
+msgstr "Prebrskaj"
+
+#: ../src/ab-main.c:975 ../src/toolbar-factory.c:155
+msgid "Edit"
+msgstr "Uredi"
+
 #: ../src/ab-window.c:184 ../src/filter-edit-dialog.c:207
-#: ../src/filter-export-dialog.c:90 ../src/filter-run-dialog.c:229
-#: ../src/filter-run-dialog.c:334
+#: ../src/filter-export-dialog.c:91 ../src/filter-run-dialog.c:209
+#: ../src/filter-run-dialog.c:318
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/ab-window.c:192 ../src/balsa-print-object-text.c:502
+#: ../src/ab-window.c:192 ../src/balsa-print-object-text.c:450
 msgid "Email Address"
 msgstr "Elektronski naslov"
 
@@ -2904,13 +3462,11 @@ msgstr "Elektronski naslov"
 msgid "_Search for Name:"
 msgstr "_Išči po imenu:"
 
-#: ../src/ab-window.c:326
-#, fuzzy
-#| msgid "Run Editor"
+#: ../src/ab-window.c:328
 msgid "Run _Editor"
-msgstr "Urejevalnik"
+msgstr "Zaženi _urejevalnik"
 
-#: ../src/ab-window.c:332
+#: ../src/ab-window.c:334
 #, fuzzy
 #| msgid "_Re-Import"
 msgid "_Re-import"
@@ -2918,29 +3474,29 @@ msgstr "Od:"
 
 #. -- grid column 3 --
 #. label for selected addresses in compose mode
-#: ../src/ab-window.c:366
+#: ../src/ab-window.c:369
 msgid "Send-To"
 msgstr "Pošlji"
 
 #. mode switching stuff
-#: ../src/ab-window.c:380
+#: ../src/ab-window.c:385
 msgid "Treat multiple addresses as:"
 msgstr "Z več naslovi ravnaj kot:"
 
-#: ../src/ab-window.c:384
+#: ../src/ab-window.c:389
 msgid "alternative addresses for the same person"
 msgstr "dodatni naslovi iste osebe"
 
-#: ../src/ab-window.c:389
+#: ../src/ab-window.c:394
 msgid "a distribution list"
 msgstr "distribucijski seznam"
 
-#: ../src/ab-window.c:433
+#: ../src/ab-window.c:438
 #, c-format
 msgid "Could not launch %s: %s"
 msgstr "Ni mogoče zagnati %s: %s"
 
-#: ../src/ab-window.c:730
+#: ../src/ab-window.c:736
 #, fuzzy, c-format
 #| msgid ""
 #| "Error opening address book '%s':\n"
@@ -2950,225 +3506,231 @@ msgid ""
 "%s"
 msgstr "Poteka odpiranje imenika »%s«"
 
-#: ../src/address-book-config.c:177
+#: ../src/address-book-config.c:180
 msgid "Suggest complete addresses:"
 msgstr "Predlagaj celotne naslove:"
 
-#: ../src/address-book-config.c:182
+#: ../src/address-book-config.c:185
 msgid "as I type"
 msgstr "med tipkanjem"
 
-#: ../src/address-book-config.c:190
+#: ../src/address-book-config.c:193
 msgid "when I hit the Escape key"
 msgstr "ob pritisku ubežne tipke"
 
-#: ../src/address-book-config.c:225 ../src/address-book-config.c:330
+#: ../src/address-book-config.c:228 ../src/address-book-config.c:334
 #, c-format
 msgid "Modify %s Address Book"
 msgstr "Spremeni imenik %s"
 
-#: ../src/address-book-config.c:229 ../src/address-book-config.c:333
+#: ../src/address-book-config.c:232 ../src/address-book-config.c:337
 #, c-format
 msgid "Add %s Address Book"
 msgstr "Dodaj imenik %s"
 
-#: ../src/address-book-config.c:230 ../src/address-book-config.c:334
-#: ../src/address-book-config.c:379 ../src/mailbox-conf.c:612
-#: ../src/pref-manager.c:2014 ../src/pref-manager.c:2097
-#: ../src/pref-manager.c:2791
+#: ../src/address-book-config.c:233 ../src/address-book-config.c:338
+#: ../src/address-book-config.c:383 ../src/mailbox-conf.c:366
+#: ../src/pref-manager.c:1996 ../src/pref-manager.c:2079
+#: ../src/pref-manager.c:2759
 msgid "_Add"
 msgstr "_Dodaj"
 
 #. mailbox name
 #. may be NULL
 #. mailbox name
-#: ../src/address-book-config.c:249 ../src/address-book-config.c:400
-#: ../src/address-book-config.c:426 ../src/address-book-config.c:492
-#: ../src/address-book-config.c:559
+#: ../src/address-book-config.c:252 ../src/address-book-config.c:404
+#: ../src/address-book-config.c:430 ../src/address-book-config.c:498
+#: ../src/address-book-config.c:567
 msgid "A_ddress Book Name:"
 msgstr "_Ime imenika:"
 
-#: ../src/address-book-config.c:374
+#: ../src/address-book-config.c:378
 #, fuzzy, c-format
 #| msgid "Modify %s Address Book"
 msgid "Modify Osmo Address Book"
 msgstr "Spremeni imenik %s"
 
-#: ../src/address-book-config.c:378
+#: ../src/address-book-config.c:382
 #, fuzzy, c-format
 #| msgid "Add %s Address Book"
 msgid "Add Osmo Address Book"
-msgstr "Dod_aj v imenik ..."
+msgstr "Dodaj imenik %s"
 
-#: ../src/address-book-config.c:431
+#: ../src/address-book-config.c:437
 msgid "Load program location:"
 msgstr "Mesto programa za nalaganje:"
 
-#: ../src/address-book-config.c:436
+#: ../src/address-book-config.c:442
 msgid "Select load program for address book"
 msgstr "Izbor programa za nalaganje imenika"
 
-#: ../src/address-book-config.c:444
+#: ../src/address-book-config.c:450
 msgid "Save program location:"
 msgstr "Mesto programa za shranjevanje:"
 
-#: ../src/address-book-config.c:449
+#: ../src/address-book-config.c:455
 msgid "Select save program for address book"
 msgstr "Izbor programa za shranjevanje imenika"
 
-#: ../src/address-book-config.c:497
-msgid "_Host Name"
-msgstr "_Ime gostitelja"
+#: ../src/address-book-config.c:505
+#, fuzzy
+#| msgid "_SMTP Server:"
+msgid "_LDAP Server URI"
+msgstr "S_trežnik SMTP:"
 
-#: ../src/address-book-config.c:502
+#: ../src/address-book-config.c:510
 msgid "Base Domain _Name"
 msgstr "_Osnovno ime domene"
 
-#: ../src/address-book-config.c:507
+#: ../src/address-book-config.c:515
 msgid "_User Name (Bind DN)"
 msgstr "_Uporabniško ime (Poveži ime domene)"
 
-#: ../src/address-book-config.c:512
+#: ../src/address-book-config.c:520
 msgid "_Password"
 msgstr "_Geslo"
 
-#: ../src/address-book-config.c:518
+#: ../src/address-book-config.c:526
 msgid "_User Address Book DN"
 msgstr "Ime domene uporabniškega  _imenika"
 
-#: ../src/address-book-config.c:524
+#: ../src/address-book-config.c:532
 msgid "Enable _TLS"
 msgstr "Omogoči _TLS"
 
-#: ../src/address-book-config.c:561 ../src/address-book-config.c:961
+#: ../src/address-book-config.c:571 ../src/address-book-config.c:960
 msgid "GPE Address Book"
 msgstr "Imenik GPE"
 
-#: ../src/address-book-config.c:601 ../src/main-window.c:949
-#: ../src/main-window.c:4083
+#: ../src/address-book-config.c:603 ../src/main-window.c:985
+#: ../src/main-window.c:3947
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "Napaka med prikazovanjem pomoči: %s\n"
 
-#: ../src/address-book-config.c:678
+#: ../src/address-book-config.c:680
 #, fuzzy
 #| msgid "No path found.  Do you want to give one?"
 msgid "No path found. Do you want to give one?"
 msgstr "Poti ni mogoče najti. Jo želite določiti?"
 
-#: ../src/address-book-config.c:937
+#: ../src/address-book-config.c:936
 #, fuzzy
 #| msgid "VCard Address Book (GnomeCard)"
 msgid "vCard Address Book (GnomeCard)"
 msgstr "Imenik GnomeVizitka"
 
-#: ../src/address-book-config.c:943
+#: ../src/address-book-config.c:942
 msgid "External query (a program)"
 msgstr "Zunanja poizvedba (program)"
 
-#: ../src/address-book-config.c:948
+#: ../src/address-book-config.c:947
 msgid "LDIF Address Book"
 msgstr "Imenik LDIF"
 
-#: ../src/address-book-config.c:954
+#: ../src/address-book-config.c:953
 msgid "LDAP Address Book"
 msgstr "Imenik LDAP"
 
-#: ../src/address-book-config.c:968
+#: ../src/address-book-config.c:967
 msgid "Rubrica2 Address Book"
 msgstr "Imenik Rubrica2"
 
-#: ../src/address-book-config.c:975
-#, fuzzy
-#| msgid "Address Book"
+#: ../src/address-book-config.c:974
 msgid "Osmo Address Book"
-msgstr "_Imenik"
+msgstr "Imenik Osmo"
 
-#: ../src/balsa-app.c:64 ../src/folder-conf.c:281 ../src/mailbox-conf.c:1378
+#: ../src/balsa-app.c:60 ../src/balsa-app.c:142
 #, fuzzy
 #| msgid "_Remember password in keyring"
 msgid "_Remember password in Secret Service"
-msgstr "Zapomni si _geslo"
-
-#: ../src/balsa-app.c:67 ../src/folder-conf.c:284 ../src/mailbox-conf.c:1381
-msgid "_Remember password in keyring"
-msgstr "_Zapomni si geslo v zbirki ključev"
+msgstr "Za_pomni si geslo"
 
-#: ../src/balsa-app.c:70 ../src/folder-conf.c:287 ../src/mailbox-conf.c:1384
+#: ../src/balsa-app.c:63 ../src/balsa-app.c:145
 msgid "_Remember password"
 msgstr "_Zapomni si geslo"
 
-#: ../src/balsa-app.c:76
+#: ../src/balsa-app.c:79 ../src/balsa-app.c:150
 #, c-format
 msgid ""
-"Opening remote mailbox %s.\n"
-"The _password for %s@%s:"
+"Password to unlock the user certificate\n"
+"%s\n"
+"for %s@%s (%s)"
 msgstr ""
-"Odpiranje oddaljenega poštnega predala %s.\n"
-"_Geslo za %s@%s:"
 
-#: ../src/balsa-app.c:81
-#, c-format
-msgid "_Password for %s@%s (%s):"
+#: ../src/balsa-app.c:84 ../src/balsa-app.c:154
+#, fuzzy, c-format
+#| msgid "_Password for %s@%s (%s):"
+msgid "Password for %s@%s (%s)"
 msgstr "_Geslo za %s@%s (%s):"
 
-#: ../src/balsa-app.c:84
+#: ../src/balsa-app.c:90 ../src/balsa-app.c:92 ../src/balsa-app.c:158
 msgid "Password needed"
 msgstr "Zahtevano je geslo"
 
-#: ../src/balsa-app.c:523
+#: ../src/balsa-app.c:178
+#, fuzzy
+#| msgid "_Password:"
+msgid "Password:"
+msgstr "_Geslo:"
+
+#: ../src/balsa-app.c:541
 #, fuzzy, c-format
 #| msgid "Couldn't open mailbox \"%s\""
 msgid "Couldn’t open mailbox “%s”"
 msgstr "Ni mogoče odpreti priloge »%s«"
 
-#: ../src/balsa-index.c:384 ../src/pref-manager.c:219
+#: ../src/balsa-index.c:413 ../src/pref-manager.c:218
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/balsa-index.c:399 ../src/pref-manager.c:220
-#: ../src/sendmsg-window.c:2699
+#: ../src/balsa-index.c:428 ../src/pref-manager.c:219
+#: ../src/sendmsg-window.c:2652
 msgid "Size"
 msgstr "Velikost"
 
-#: ../src/balsa-index.c:1653
+#: ../src/balsa-index.c:1594
+#, c-format
+msgid "Reply to Group: %d message is not from a mailing list."
+msgid_plural "Reply to Group: %d messages are not from a mailing list."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../src/balsa-index.c:1695
 #, c-format
 msgid "Move to Trash failed: %s"
 msgstr "Premikanje v smeti ni bilo uspešno: %s"
 
-#: ../src/balsa-index.c:1811
-#, fuzzy
-#| msgid "Reply"
+#: ../src/balsa-index.c:1855 ../ui/main-window.ui.h:68
+#: ../ui/message-window.ui.h:21
 msgid "_Reply…"
-msgstr "Odgovo_ri"
+msgstr "_Odgovori …"
 
-#: ../src/balsa-index.c:1813
-#, fuzzy
-#| msgid "Reply To _All..."
+#: ../src/balsa-index.c:1857
 msgid "Reply To _All…"
-msgstr "Odgovori _vsem"
+msgstr "Odgovori _vsem …"
 
-#: ../src/balsa-index.c:1815
-#, fuzzy
-#| msgid "Reply To _Group..."
+#: ../src/balsa-index.c:1859
 msgid "Reply To _Group…"
-msgstr ""
-"Odgovori\n"
-"skupini"
+msgstr "Odgovori _skupini …"
 
-#: ../src/balsa-index.c:1817
+#: ../src/balsa-index.c:1861 ../ui/main-window.ui.h:71
+#: ../ui/message-window.ui.h:24
 #, fuzzy
 #| msgid "_Forward Attached..."
 msgid "_Forward Attached…"
 msgstr "P_osreduj kot priloženo ..."
 
-#: ../src/balsa-index.c:1819
+#: ../src/balsa-index.c:1863 ../ui/main-window.ui.h:72
+#: ../ui/message-window.ui.h:25
 #, fuzzy
 #| msgid "Forward _Inline..."
 msgid "Forward _Inline…"
 msgstr "P_osreduj v novem sporočilu"
 
-#: ../src/balsa-index.c:1821
+#: ../src/balsa-index.c:1865 ../ui/main-window.ui.h:73
 #, fuzzy
 #| msgid "_Pipe through..."
 msgid "_Pipe through…"
@@ -3176,47 +3738,46 @@ msgstr ""
 "Opomba: uporaba cevi z ukazom cat je koristna, kadar potrebujete\n"
 "možnosti oblikovanja kot so -n, -T in druge."
 
-#: ../src/balsa-index.c:1823
-#, fuzzy
-#| msgid "Store Address"
+#: ../src/balsa-index.c:1867 ../ui/main-window.ui.h:83
 msgid "_Store Address…"
-msgstr "Shrani naslov"
+msgstr "_Shrani naslov …"
 
-#: ../src/balsa-index.c:1837 ../src/mailbox-node.c:1105
-#: ../src/mailbox-node.c:1121 ../src/pref-manager.c:2019
-#: ../src/pref-manager.c:2104 ../src/pref-manager.c:2798
+#: ../src/balsa-index.c:1881 ../src/mailbox-node.c:1044
+#: ../src/mailbox-node.c:1060 ../src/pref-manager.c:2001
+#: ../src/pref-manager.c:2086 ../src/pref-manager.c:2766 ../ui/ab-main.ui.h:11
+#: ../ui/main-window.ui.h:61
 msgid "_Delete"
 msgstr "_Izbriši"
 
-#: ../src/balsa-index.c:1841
+#: ../src/balsa-index.c:1885
 msgid "_Undelete"
 msgstr "Ra_zveljavi izbris"
 
-#: ../src/balsa-index.c:1845
+#: ../src/balsa-index.c:1889
 msgid "Move To _Trash"
 msgstr "Premakni v s_meti"
 
-#: ../src/balsa-index.c:1849
+#: ../src/balsa-index.c:1893
 msgid "T_oggle"
 msgstr "P_reklopi"
 
-#: ../src/balsa-index.c:1852
+#: ../src/balsa-index.c:1896 ../ui/main-window.ui.h:55
 msgid "_Flagged"
 msgstr "Z _zastavico"
 
-#: ../src/balsa-index.c:1855
+#: ../src/balsa-index.c:1899
 msgid "_Unread"
 msgstr "N_eprebrano"
 
-#: ../src/balsa-index.c:1863
+#: ../src/balsa-index.c:1907
 msgid "_Move to"
 msgstr "Pre_makni v"
 
-#: ../src/balsa-index.c:1870
+#: ../src/balsa-index.c:1914
 msgid "_View Source"
 msgstr "_Ogled izvorne kode"
 
-#: ../src/balsa-index.c:2116
+#: ../src/balsa-index.c:2141
 #, fuzzy, c-format
 #| msgid "Failed to copy %d message to mailbox \"%s\": %s"
 #| msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
@@ -3227,231 +3788,223 @@ msgstr[1] "Kopiranje %d sporočila v poštni predal \"%s\" je spodletelo: %s"
 msgstr[2] "Kopiranje %d sporočil v poštni predal \"%s\" je spodletelo: %s"
 msgstr[3] "Kopiranje %d sporočil v poštni predal \"%s\" je spodletelo: %s"
 
-#: ../src/balsa-index.c:2128
+#: ../src/balsa-index.c:2153
 #, fuzzy, c-format
 #| msgid "Copied to \"%s\"."
 msgid "Copied to “%s”."
-msgstr "%s od %s kopirano"
+msgstr "Predmet »%s« je kopiran v »%s«."
 
-#: ../src/balsa-index.c:2129
+#: ../src/balsa-index.c:2154
 #, fuzzy, c-format
 #| msgid "Moved to \"%s\"."
 msgid "Moved to “%s”."
-msgstr "Premaknjeno v \"%s\"."
+msgstr ""
+"Datoteka »%s« je okvarjena in je ni mogoče razčleniti. Premaknjena je v "
+"»%s«, vstavek Latex pa bo povrnjen na osnoven nabor orodij."
 
-#: ../src/balsa-index.c:2233
+#: ../src/balsa-index.c:2245
 #, c-format
 msgid "Committing mailbox %s failed."
 msgstr "Uveljavljanje poštnega predala %s ni uspelo."
 
-#: ../src/balsa-index.c:2342
+#: ../src/balsa-index.c:2354
 #, c-format
 msgid "Cannot process the message: %s"
 msgstr "Sporočila ni mogoče obdelati: %s"
 
-#: ../src/balsa-index.c:2458
+#: ../src/balsa-index.c:2469
 #, c-format
 msgid "Cannot access message %u to pass to %s"
 msgstr "Ni mogoč dostop do sporočila %u za prenos v %s"
 
-#: ../src/balsa-index.c:2485
+#: ../src/balsa-index.c:2496
 #, c-format
 msgid "Cannot read message %u to pass to %s"
 msgstr "Ni mogoče prebrati sporočila %u za prenos v %s"
 
-#: ../src/balsa-index.c:2652
+#: ../src/balsa-index.c:2669
 msgid "Pipe message through a program"
 msgstr "Pošlji sporočila skozi program"
 
-#: ../src/balsa-index.c:2656
+#: ../src/balsa-index.c:2673
 msgid "_Run"
 msgstr "_Zaženi"
 
-#: ../src/balsa-index.c:2668
+#: ../src/balsa-index.c:2685
 msgid "Specify the program to run:"
 msgstr "Navedite program za zagon:"
 
-#: ../src/balsa-mblist.c:353
-msgid "Mailbox"
-msgstr "Poštni predal"
-
-#: ../src/balsa-mblist.c:1146 ../src/balsa-mblist.c:1196
-msgid "Failed to find mailbox"
-msgstr "Ni mogoče najti poštnega predala"
-
-#: ../src/balsa-mblist.c:1774
+#: ../src/balsa-mblist.c:1769
 msgid "_Other…"
 msgstr "_Drugo ..."
 
-#: ../src/balsa-mblist.c:1891
+#: ../src/balsa-mblist.c:1886
 msgid "Choose destination folder"
 msgstr "Izbor ciljne mape"
 
-#: ../src/balsa-mblist.c:2085
-#, fuzzy
-#| msgid "Other..."
+#: ../src/balsa-mblist.c:2087
 msgid "Other…"
-msgstr "Ostalo:"
-
-#: ../src/balsa-message.c:283
-msgid "Check cryptographic signature"
-msgstr "Preveri šifrirni podpis"
+msgstr "Drugo …"
 
-#: ../src/balsa-message.c:300
+#: ../src/balsa-message.c:267
 msgid "Select message part to display"
 msgstr "Izbor dela sporočila za prikaz"
 
-#: ../src/balsa-message.c:375
+#: ../src/balsa-message.c:319
 msgid "Wrapped"
 msgstr "Prelomljeno"
 
-#: ../src/balsa-message.c:379
+#: ../src/balsa-message.c:323
 msgid "Not found"
 msgstr "Ni zadetkov"
 
-#: ../src/balsa-message.c:608
+#: ../src/balsa-message.c:564
 msgid "Find:"
 msgstr "Poišči:"
 
-#: ../src/balsa-message.c:620 ../src/toolbar-factory.c:149
+#: ../src/balsa-message.c:576 ../src/toolbar-factory.c:124
 msgid "Previous"
 msgstr "Nazaj"
 
-#: ../src/balsa-message.c:627 ../src/toolbar-factory.c:150
+#: ../src/balsa-message.c:583 ../src/toolbar-factory.c:125
 msgid "Next"
 msgstr "Naprej"
 
-#: ../src/balsa-message.c:711
+#: ../src/balsa-message.c:683
 msgid "Content"
 msgstr "Vsebina"
 
-#: ../src/balsa-message.c:797
+#: ../src/balsa-message.c:776
 msgid "Message parts"
 msgstr "Deli sporočila"
 
-#: ../src/balsa-message.c:989
+#: ../src/balsa-message.c:953
 #, fuzzy
 #| msgid "Save selected as..."
 msgid "Save selected as…"
-msgstr "Shrani izbrano"
+msgstr "_Shrani izbrano"
 
-#: ../src/balsa-message.c:996
+#: ../src/balsa-message.c:960
 #, fuzzy
 #| msgid "Save selected to folder..."
 msgid "Save selected to folder…"
-msgstr "Shrani izbrano"
+msgstr "_Shrani izbrano"
 
-#: ../src/balsa-message.c:1106
+#: ../src/balsa-message.c:1067
 msgid "(No sender)"
 msgstr "(ni pošiljatelja)"
 
-#: ../src/balsa-message.c:1159 ../src/balsa-message.c:1171
+#: ../src/balsa-message.c:1122 ../src/balsa-message.c:1134
 #, fuzzy, c-format
 #| msgid "Could not access message %u in mailbox \"%s\"."
 msgid "Could not access message %u in mailbox “%s”."
 msgstr "Ni mogoč dostop do sporočila %u za prenos v %s"
 
-#: ../src/balsa-message.c:1338
+#: ../src/balsa-message.c:1187 ../src/main.c:549
+#, fuzzy, c-format
+#| msgid "error: %s"
+msgid "Autocrypt error: %s"
+msgstr "napaka: %s"
+
+#: ../src/balsa-message.c:1321
 msgid "mixed parts"
 msgstr "mešani deli"
 
-#: ../src/balsa-message.c:1340
+#: ../src/balsa-message.c:1323
 msgid "alternative parts"
 msgstr "dodatni deli"
 
-#: ../src/balsa-message.c:1342
+#: ../src/balsa-message.c:1325
 msgid "signed parts"
 msgstr "podpisani deli"
 
-#: ../src/balsa-message.c:1344
+#: ../src/balsa-message.c:1327
 msgid "encrypted parts"
 msgstr "šifrirani deli"
 
-#: ../src/balsa-message.c:1346
+#: ../src/balsa-message.c:1329
 msgid "RFC822 message"
 msgstr "Sporočilo RFC822"
 
-#: ../src/balsa-message.c:1348
+#: ../src/balsa-message.c:1331
 #, fuzzy, c-format
 #| msgid "\"%s\" parts"
 msgid "“%s” parts"
 msgstr "delov"
 
-#: ../src/balsa-message.c:1396
+#: ../src/balsa-message.c:1379
 msgid "force inline for all parts"
 msgstr "vsili vse dele medvrstično"
 
-#: ../src/balsa-message.c:1439
+#: ../src/balsa-message.c:1422
 #, fuzzy, c-format
 #| msgid "rfc822 message (from %s, subject \"%s\")"
 msgid "RFC822 message (from %s, subject “%s”)"
 msgstr "------ posredovano sporočilo od %s ------\n"
 
-#: ../src/balsa-message.c:1451
+#: ../src/balsa-message.c:1434
 msgid "complete message"
 msgstr "celotno sporočilo"
 
-#: ../src/balsa-message.c:1468
+#: ../src/balsa-message.c:1451
 #, c-format
 msgid "part %s: %s (file %s)"
 msgstr "del %s: %s (datoteka %s)"
 
-#: ../src/balsa-message.c:1479
+#: ../src/balsa-message.c:1462
 #, c-format
 msgid "part %s: %s"
 msgstr "del %s: %s"
 
-#: ../src/balsa-message.c:1494
+#: ../src/balsa-message.c:1476
 msgid "encrypted: "
 msgstr "šifrirano:"
 
-#: ../src/balsa-message.c:1634
+#: ../src/balsa-message.c:1612
 #, c-format
 msgid "Reading embedded message failed: %s"
 msgstr "Branje vključenega sporočila je spodletelo: %s"
 
-#: ../src/balsa-message.c:1642
+#: ../src/balsa-message.c:1620
 #, c-format
 msgid "Appending message to %s failed: %s"
 msgstr "Pripenjanje sporočila %s je spodletelo: %s"
 
-#: ../src/balsa-message.c:1671
-#, fuzzy
-#| msgid "_Save"
+#: ../src/balsa-message.c:1649
 msgid "_Save…"
-msgstr "_Shrani:"
+msgstr "_Shrani …"
 
-#: ../src/balsa-message.c:1680 ../src/balsa-mime-widget-message.c:447
+#: ../src/balsa-message.c:1658 ../src/balsa-mime-widget-message.c:457
 #, fuzzy
 #| msgid "Copy to folder:"
 msgid "_Copy to folder…"
-msgstr "Kopira v mapo"
+msgstr "Kopiraj v mapo:"
 
-#: ../src/balsa-message.c:1763
+#: ../src/balsa-message.c:1738
 msgid "Select folder for saving selected parts"
 msgstr "Izbor mape za shranjevanje izbranih delov"
 
-#: ../src/balsa-message.c:1788
+#: ../src/balsa-message.c:1763
 #, c-format
 msgid "Could not create URI for %s"
 msgstr "Ni mogoče ustvariti naslova URI za %s"
 
-#: ../src/balsa-message.c:1813
+#: ../src/balsa-message.c:1788
 #, c-format
 msgid "%s message part"
 msgstr "%s del sporočila"
 
-#: ../src/balsa-message.c:1846 ../src/balsa-mime-widget-callbacks.c:164
+#: ../src/balsa-message.c:1821 ../src/balsa-mime-widget-callbacks.c:164
 #, c-format
 msgid "Could not save %s: %s"
 msgstr "Ni mogoče shraniti %s: %s"
 
-#: ../src/balsa-message.c:2485 ../src/balsa-message.c:2626
+#: ../src/balsa-message.c:2471 ../src/balsa-message.c:2616
 #, c-format
 msgid "Sending the disposition notification failed: %s"
 msgstr "Pošiljanje sporočila o prejetju je spodletelo: %s"
 
-#: ../src/balsa-message.c:2582
+#: ../src/balsa-message.c:2571
 #, fuzzy, c-format
 #| msgid ""
 #| "The sender of this mail, %s, requested \n"
@@ -3466,11 +4019,11 @@ msgstr ""
 "se obvestilo o prejetju sporočila vrne na naslov `%s'.\n"
 "Ali želite poslati to obvestilo?"
 
-#: ../src/balsa-message.c:2592
+#: ../src/balsa-message.c:2581
 msgid "Reply to MDN?"
 msgstr "Odgovori na obvestilo o prejetju sporočilca?"
 
-#: ../src/balsa-message.c:2802
+#: ../src/balsa-message.c:2791
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once.\n"
@@ -3479,18 +4032,18 @@ msgstr ""
 "Ni mogoče dešifrirati sporočila, ker je sporočilo prikazano več kot enkrat.\n"
 "Zaprite druge primere tega sporočila in poskusite znova."
 
-#: ../src/balsa-message.c:2823 ../src/balsa-message.c:2908
-#: ../src/balsa-message.c:3030
+#: ../src/balsa-message.c:2812 ../src/balsa-message.c:2897
+#: ../src/balsa-message.c:3023
 #, c-format
 msgid "Parsing a message part failed: %s"
 msgstr "Razčlenjevanje dela sporočila ni uspelo: %s"
 
-#: ../src/balsa-message.c:2824 ../src/balsa-message.c:2909
-#: ../src/balsa-message.c:3031
+#: ../src/balsa-message.c:2813 ../src/balsa-message.c:2898
+#: ../src/balsa-message.c:3024
 msgid "Possible disk space problem."
 msgstr "Mogoča je težava s prostorom na disku."
 
-#: ../src/balsa-message.c:2838
+#: ../src/balsa-message.c:2827
 #, fuzzy, c-format
 #| msgid ""
 #| "The message sent by %s with subject \"%s\" contains an encrypted part, "
@@ -3502,7 +4055,7 @@ msgstr ""
 "Sporočilo poslano od %s z zadevo \"%s\" vsebuje šifriran del, vendar je "
 "njihova struktura napačna."
 
-#: ../src/balsa-message.c:2846
+#: ../src/balsa-message.c:2835
 #, fuzzy, c-format
 #| msgid ""
 #| "The message sent by %s with subject \"%s\" contains a PGP encrypted part, "
@@ -3514,7 +4067,7 @@ msgstr ""
 "Sporočilo poslano od %s z zadevo \"%s\" vsebuje PGP šifriran del, vendar "
 "šifrirni protokol ni na voljo."
 
-#: ../src/balsa-message.c:2859
+#: ../src/balsa-message.c:2848
 #, fuzzy, c-format
 #| msgid ""
 #| "The message sent by %s with subject \"%s\" contains a S/MIME encrypted "
@@ -3526,7 +4079,7 @@ msgstr ""
 "Sporočilo poslano od %s z zadevo \"%s\" vsebuje S/MIME šifriran del, vendar "
 "šifrirni protokol ni na voljo."
 
-#: ../src/balsa-message.c:2926
+#: ../src/balsa-message.c:2915
 #, fuzzy, c-format
 #| msgid ""
 #| "The message sent by %s with subject \"%s\" contains a signed part, but "
@@ -3539,7 +4092,7 @@ msgstr ""
 "Sporočilo poslano od %s z zadevo \"%s\" vsebuje podpisan del, vendar je "
 "njegova struktura neveljavna. Podpisa, če obstaja, ni mogoče preveriti."
 
-#: ../src/balsa-message.c:2939
+#: ../src/balsa-message.c:2928
 #, fuzzy, c-format
 #| msgid ""
 #| "The message sent by %s with subject \"%s\" contains a %s signed part, but "
@@ -3551,27 +4104,19 @@ msgstr ""
 "Sporočilo poslano od %s z zadevo  \"%s\" vsebuje podpisan del %s, vendar "
 "šifrirni protokol ni na voljo."
 
-#: ../src/balsa-message.c:2942
+#: ../src/balsa-message.c:2931
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/balsa-message.c:2942 ../src/print-gtk.c:199
-msgid "S/MIME"
-msgstr "S/MIME"
-
-#: ../src/balsa-message.c:2966 ../src/balsa-message.c:3093
-msgid "Detected a good signature"
-msgstr "Zaznan je dober podpis"
-
-#: ../src/balsa-message.c:2972
+#: ../src/balsa-message.c:2960
 msgid "Detected a good signature with insufficient validity"
 msgstr "Zaznan je dober podpis z nezadostno veljavnostjo"
 
-#: ../src/balsa-message.c:2977 ../src/balsa-message.c:3097
+#: ../src/balsa-message.c:2965 ../src/balsa-message.c:3090
 msgid "Detected a good signature with insufficient validity/trust"
 msgstr "Zaznan je dober podpis z nezadostno veljavnostjo ali zaupanjem"
 
-#: ../src/balsa-message.c:2984 ../src/balsa-message.c:3103
+#: ../src/balsa-message.c:2975 ../src/balsa-message.c:3099
 #, fuzzy, c-format
 #| msgid ""
 #| "Checking the signature of the message sent by %s with subject \"%s\" "
@@ -3585,7 +4130,7 @@ msgstr ""
 "Preverjanje podpisa sporočila od %s z zadevo \"%s\" je vrnilo:\n"
 "%s"
 
-#: ../src/balsa-message.c:2996
+#: ../src/balsa-message.c:2988
 #, fuzzy, c-format
 #| msgid ""
 #| "Checking the signature of the message sent by %s with subject \"%s\" "
@@ -3596,14 +4141,14 @@ msgid ""
 msgstr ""
 "Preverjanje podpisa sporočila od %s z zadevo \"%s\" je spodletelo z napako!"
 
-#: ../src/balsa-message.c:3055
+#: ../src/balsa-message.c:3050
 msgid ""
 "The decryption cannot be performed because this message is displayed more "
 "than once."
 msgstr ""
 "Dešifriranje sporočila ni mogoče, ker je sporočilo prikazano več kot enkrat."
 
-#: ../src/balsa-message.c:3057
+#: ../src/balsa-message.c:3052
 msgid ""
 "The signature check and removal of the OpenPGP armor cannot be performed "
 "because this message is displayed more than once."
@@ -3611,40 +4156,40 @@ msgstr ""
 "Ni mogoče preveriti podpisa in odstraniti oklepa OpenPGP, ker je to "
 "sporočilo prikazano več kot enkrat."
 
-#: ../src/balsa-message.c:3060
+#: ../src/balsa-message.c:3055
 msgid "Please close the other instances of this message and try again."
 msgstr "Zaprite druge odprte primerke tega sporočila in poskusite znova."
 
-#: ../src/balsa-mime-widget.c:240 ../src/balsa-mime-widget-message.c:176
-#: ../src/balsa-mime-widget-message.c:222
+#: ../src/balsa-mime-widget.c:206 ../src/balsa-mime-widget-message.c:189
+#: ../src/balsa-mime-widget-message.c:235
 #, c-format
 msgid "File name: %s"
 msgstr "Ime datoteke: %s"
 
-#: ../src/balsa-mime-widget.c:256
+#: ../src/balsa-mime-widget.c:222
 #, c-format
 msgid "Error reading message part: %s"
 msgstr "Napaka med branjem dela sporočila: %s"
 
-#: ../src/balsa-mime-widget.c:288
+#: ../src/balsa-mime-widget.c:254
 #, c-format
 msgid "Type: %s (%s)"
 msgstr "Vrsta: %s (%s)"
 
-#: ../src/balsa-mime-widget.c:292
+#: ../src/balsa-mime-widget.c:258
 #, c-format
 msgid "Content Type: %s"
 msgstr "Vrsta vsebine: %s"
 
-#: ../src/balsa-mime-widget.c:306
+#: ../src/balsa-mime-widget.c:272
 msgid "No open or view action defined for this content type"
 msgstr "Za to vrsto vsebine ni določeno dejanje odpiranja ali ogleda"
 
-#: ../src/balsa-mime-widget.c:311
+#: ../src/balsa-mime-widget.c:277
 msgid "S_ave part"
 msgstr "_Shrani del"
 
-#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1452
+#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1409
 #, c-format
 msgid "Could not launch application: %s"
 msgstr "Ni mogoče zagnati programa: %s"
@@ -3668,224 +4213,290 @@ msgstr "Datoteka že obstaja. Ali naj bo prepisana?"
 msgid "Unlink %s: %s"
 msgstr "Razveži %s: %s"
 
-#: ../src/balsa-mime-widget-crypto.c:93
+#: ../src/balsa-mime-widget-crypto.c:76 ../src/balsa-mime-widget-text.c:253
+#, c-format
+msgid "Could not save a text part: %s"
+msgstr "Ni mogoče shraniti besedilnega dela: %s"
+
+#: ../src/balsa-mime-widget-crypto.c:82
+#, fuzzy, c-format
+#| msgid "Could not open trash: %s"
+msgid "Could not process GnuPG keys: %s"
+msgstr "Ni mogoče odpreti smeti: %s"
+
+#: ../src/balsa-mime-widget-crypto.c:142
+msgid "_Import Autocrypt key"
+msgstr ""
+
+#: ../src/balsa-mime-widget-crypto.c:148
 #, fuzzy
 msgid "_Search key server for this key"
 msgstr "Poišči ključe na strežniku ključev"
 
-#: ../src/balsa-mime-widget-crypto.c:95
+#: ../src/balsa-mime-widget-crypto.c:150
 #, fuzzy
 #| msgid "_Run GnuPG to check for an update of this key"
 msgid "_Search key server for updates of this key"
 msgstr "Poišči ključe na strežniku ključev"
 
-#: ../src/balsa-mime-widget-image.c:119 ../src/balsa-mime-widget-image.c:252
+#: ../src/balsa-mime-widget-crypto.c:194
+#, fuzzy
+#| msgid "encrypted: "
+msgid "decrypted"
+msgstr "šifrirano:"
+
+#: ../src/balsa-mime-widget-crypto.c:207
+#, fuzzy
+#| msgid "_Execute signature"
+msgid "trusted signature"
+msgstr "I_zvedi podpis"
+
+#: ../src/balsa-mime-widget-crypto.c:210
+#, fuzzy
+#| msgid "_Execute signature"
+msgid "low trust signature"
+msgstr "I_zvedi podpis"
+
+#: ../src/balsa-mime-widget-crypto.c:213
+#, fuzzy
+#| msgid "Signature"
+msgid "bad signature"
+msgstr "Podpis"
+
+#: ../src/balsa-mime-widget-crypto.c:216
+#, fuzzy
+#| msgid "No signature found!"
+msgid "unknown signature status"
+msgstr "Ni mogoče najti podpisa!"
+
+#: ../src/balsa-mime-widget-crypto.c:302
+#, c-format
+msgid ""
+"Import GnuPG key:\n"
+"%s"
+msgstr ""
+
+#: ../src/balsa-mime-widget-crypto.c:309
+#, fuzzy, c-format
+msgid "Error importing key data: %s"
+msgstr "Napaka med uvažanjem stikov: %s"
+
+#: ../src/balsa-mime-widget-crypto.c:309 ../src/sendmsg-window.c:1677
+msgid "unknown error"
+msgstr "neznana napaka"
+
+#: ../src/balsa-mime-widget-crypto.c:346
+msgid "(imported)"
+msgstr "(uvoženo)"
+
+#: ../src/balsa-mime-widget-crypto.c:354
+#, fuzzy
+msgid "Import key into the local key ring"
+msgstr "Uvozi izbrane ključe v osebno zbirko ključev"
+
+#: ../src/balsa-mime-widget-image.c:196
 #, c-format
 msgid "Error loading attached image: %s\n"
 msgstr "Napaka med nalaganjem priložene slike: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:144 ../src/balsa-print-object.c:113
+#: ../src/balsa-mime-widget-message.c:153 ../src/balsa-print-object.c:90
 msgid "message headers"
 msgstr "glave sporočil"
 
-#: ../src/balsa-mime-widget-message.c:174
-#: ../src/balsa-mime-widget-message.c:186
-#: ../src/balsa-mime-widget-message.c:214
-#: ../src/balsa-mime-widget-message.c:267
+#: ../src/balsa-mime-widget-message.c:187
+#: ../src/balsa-mime-widget-message.c:199
+#: ../src/balsa-mime-widget-message.c:227
+#: ../src/balsa-mime-widget-message.c:279
 msgid "Content Type: external-body\n"
 msgstr "Vrsta vsebine: zunanje-telo\n"
 
-#: ../src/balsa-mime-widget-message.c:175
+#: ../src/balsa-mime-widget-message.c:188
 #, c-format
 msgid "Access type: local-file\n"
 msgstr "Vrsta dostopa: krajevna-datoteka\n"
 
-#: ../src/balsa-mime-widget-message.c:187
+#: ../src/balsa-mime-widget-message.c:200
 #, c-format
 msgid "Access type: URL\n"
 msgstr "Vrsta dostopa: URL\n"
 
-#: ../src/balsa-mime-widget-message.c:188
+#: ../src/balsa-mime-widget-message.c:201
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../src/balsa-mime-widget-message.c:215
+#: ../src/balsa-mime-widget-message.c:228
 #, c-format
 msgid "Access type: %s\n"
 msgstr "Vrsta dostopa: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:219
+#: ../src/balsa-mime-widget-message.c:232
 #, c-format
 msgid "FTP site: %s\n"
 msgstr "Stran FTP: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:221
+#: ../src/balsa-mime-widget-message.c:234
 #, c-format
 msgid "Directory: %s\n"
 msgstr "Mapa: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:268
+#: ../src/balsa-mime-widget-message.c:280
 msgid "Access type: mail-server\n"
 msgstr "Vrsta dostopa: poštni-strežnik\n"
 
-#: ../src/balsa-mime-widget-message.c:269
+#: ../src/balsa-mime-widget-message.c:281
 #, c-format
 msgid "Mail server: %s\n"
 msgstr "Poštni strežnik: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:271
+#: ../src/balsa-mime-widget-message.c:283
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Zadeva: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:288
+#: ../src/balsa-mime-widget-message.c:299
 msgid "Se_nd message to obtain this part"
 msgstr "Pošlji _sporočilo za pridobitev tega dela"
 
-#: ../src/balsa-mime-widget-message.c:323 ../src/balsa-mime-widget-text.c:811
-#: ../src/sendmsg-window.c:1487
+#: ../src/balsa-mime-widget-message.c:325 ../src/balsa-mime-widget-text.c:883
+#: ../src/sendmsg-window.c:1435
 #, c-format
 msgid "Error showing %s: %s\n"
 msgstr "Napaka med prikazovanjem %s: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:358
+#: ../src/balsa-mime-widget-message.c:362
 #, c-format
 msgid "Could not get a part: %s"
 msgstr "Ni mogoče dobiti dela: %s"
 
-#: ../src/balsa-mime-widget-message.c:386
+#: ../src/balsa-mime-widget-message.c:392
 #, c-format
 msgid "Sending the external body request failed: %s"
 msgstr "Pošiljanje zahteve zunanjega telesa je spodletelo: %s"
 
-#: ../src/balsa-mime-widget-message.c:439
+#: ../src/balsa-mime-widget-message.c:449
 msgid "Reply…"
 msgstr "Odgovori ..."
 
 #. Gmail sometimes fails to do that.
-#: ../src/balsa-mime-widget-message.c:711
+#: ../src/balsa-mime-widget-message.c:723
 msgid "Error:"
 msgstr "Napaka:"
 
-#: ../src/balsa-mime-widget-message.c:712
+#: ../src/balsa-mime-widget-message.c:724
 msgid "IMAP server did not report message structure"
 msgstr "Strežnik IMAP ni poročal o zgradbi sporočila"
 
-#: ../src/balsa-mime-widget-message.c:725
-#: ../src/balsa-print-object-header.c:156 ../src/sendmsg-window.c:747
-#: ../src/sendmsg-window.c:749 ../src/sendmsg-window.c:841
-#: ../src/sendmsg-window.c:3512 ../src/sendmsg-window.c:5029
+#: ../src/balsa-mime-widget-message.c:735
+#: ../src/balsa-print-object-header.c:131 ../src/sendmsg-window.c:711
+#: ../src/sendmsg-window.c:713 ../src/sendmsg-window.c:804
+#: ../src/sendmsg-window.c:3575 ../src/sendmsg-window.c:5119
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: ../src/balsa-mime-widget-message.c:730
-#: ../src/balsa-print-object-header.c:164 ../src/sendmsg-window.c:3508
+#: ../src/balsa-mime-widget-message.c:740
+#: ../src/balsa-print-object-header.c:139 ../src/sendmsg-window.c:3571
 msgid "Date:"
 msgstr "Datum:"
 
 #. addresses
-#: ../src/balsa-mime-widget-message.c:736
-#: ../src/balsa-print-object-header.c:169 ../src/sendmsg-window.c:3519
+#: ../src/balsa-mime-widget-message.c:746
+#: ../src/balsa-print-object-header.c:144 ../src/sendmsg-window.c:3582
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/balsa-mime-widget-message.c:743
+#: ../src/balsa-mime-widget-message.c:753
 msgid "Reply-To:"
 msgstr "Odgovor-za:"
 
-#: ../src/balsa-mime-widget-message.c:756
-#: ../src/balsa-print-object-header.c:177
+#: ../src/balsa-mime-widget-message.c:766
+#: ../src/balsa-print-object-header.c:152
 msgid "FCC:"
 msgstr ""
 
-#: ../src/balsa-mime-widget-message.c:764
-#: ../src/balsa-print-object-header.c:180
+#: ../src/balsa-mime-widget-message.c:774
+#: ../src/balsa-print-object-header.c:155
 msgid "Disposition-Notification-To:"
 msgstr "Obvestilo-o-prejetju-na:"
 
-#: ../src/balsa-mime-widget-text.c:156
-#, c-format
-msgid "Could not save a text part: %s"
-msgstr "Ni mogoče shraniti besedilnega dela: %s"
-
-#: ../src/balsa-mime-widget-text.c:507
+#: ../src/balsa-mime-widget-text.c:583
 msgid "Copy link"
 msgstr "Kopiraj povezavo"
 
-#: ../src/balsa-mime-widget-text.c:512
+#: ../src/balsa-mime-widget-text.c:588
 msgid "Open link"
 msgstr "Odpri povezavo"
 
-#: ../src/balsa-mime-widget-text.c:517
+#: ../src/balsa-mime-widget-text.c:593
 msgid "Send link…"
 msgstr "Pošlji povezavo ..."
 
-#: ../src/balsa-mime-widget-text.c:548 ../src/balsa-mime-widget-text.c:1089
+#: ../src/balsa-mime-widget-text.c:623 ../src/balsa-mime-widget-text.c:1145
 msgid "Save…"
 msgstr "Shrani ..."
 
-#: ../src/balsa-mime-widget-text.c:558
+#: ../src/balsa-mime-widget-text.c:631
 msgid "Highlight structured phrases"
 msgstr "Poudari oblikovana rekla"
 
-#: ../src/balsa-mime-widget-text.c:789
+#: ../src/balsa-mime-widget-text.c:868
 #, fuzzy, c-format
 #| msgid "Calling URL %s..."
 msgid "Calling URL %s…"
 msgstr "Napaka med klicanjem predmeta StartServiceByName za %s: "
 
-#: ../src/balsa-mime-widget-text.c:1056
+#: ../src/balsa-mime-widget-text.c:1112
 msgid "Zoom In"
 msgstr "Približaj"
 
-#: ../src/balsa-mime-widget-text.c:1061
+#: ../src/balsa-mime-widget-text.c:1117
 msgid "Zoom Out"
 msgstr "Oddalji"
 
-#: ../src/balsa-mime-widget-text.c:1066
+#: ../src/balsa-mime-widget-text.c:1122
 #, fuzzy
 #| msgid "Zoom _100%"
 msgid "Zoom 100%"
 msgstr "_Približaj na 100 %"
 
-#: ../src/balsa-mime-widget-text.c:1075
+#: ../src/balsa-mime-widget-text.c:1131 ../ui/main-window.ui.h:21
+#: ../ui/message-window.ui.h:7 ../ui/sendmsg-window.ui.h:19
 msgid "Select _All"
 msgstr "Izberi _vse"
 
-#: ../src/balsa-mime-widget-text.c:1098
+#: ../src/balsa-mime-widget-text.c:1154
 msgid "Print…"
 msgstr "Natisni ..."
 
-#: ../src/balsa-mime-widget-text.c:1236
+#: ../src/balsa-mime-widget-text.c:1303
 msgid "S_tore Address"
 msgstr "_Shrani naslov"
 
-#: ../src/balsa-mime-widget-text.c:1243
+#: ../src/balsa-mime-widget-text.c:1309
 msgid "Full Name:"
 msgstr "Polno Ime:"
 
-#: ../src/balsa-mime-widget-text.c:1244
+#: ../src/balsa-mime-widget-text.c:1310
 msgid "Nick Name:"
 msgstr "Vzdevek:"
 
-#: ../src/balsa-mime-widget-text.c:1245
+#: ../src/balsa-mime-widget-text.c:1311
 msgid "First Name:"
 msgstr "Ime:"
 
-#: ../src/balsa-mime-widget-text.c:1246
+#: ../src/balsa-mime-widget-text.c:1312
 msgid "Last Name:"
 msgstr "Priimek"
 
-#: ../src/balsa-mime-widget-text.c:1247
+#: ../src/balsa-mime-widget-text.c:1313
 msgid "Organization:"
 msgstr "Ustanova:"
 
-#: ../src/balsa-mime-widget-text.c:1249
+#: ../src/balsa-mime-widget-text.c:1314
 msgid "Email Address:"
 msgstr "Elektronski naslov:"
 
-#: ../src/balsa-mime-widget-text.c:1277
+#: ../src/balsa-mime-widget-text.c:1342
 #, fuzzy, c-format
 #| msgid ""
 #| "The message sent by %s with subject \"%s\" contains 8-bit characters, but "
@@ -3897,35 +4508,53 @@ msgstr ""
 "Sporočilo poslano od %s z zadevo \"%s\" vsebuje 8-bitne znake, vendar brez "
 "podatkov o uporabi kodnega nabora (pretvorjeno v %s)."
 
-#: ../src/balsa-mime-widget-vcalendar.c:65
+#: ../src/balsa-mime-widget-vcalendar.c:66 ../src/balsa-print-object-text.c:534
 #, fuzzy, c-format
 #| msgid "This is an iTIP calendar \"%s\" message."
 msgid "This is an iTIP calendar “%s” message."
 msgstr "Koledar: od %s do %s"
 
-#: ../src/balsa-mime-widget-vcalendar.c:171
+#: ../src/balsa-mime-widget-vcalendar.c:185
+#: ../src/balsa-mime-widget-vcalendar.c:376
+#: ../src/balsa-print-object-text.c:543
 msgid "Summary:"
 msgstr "Povzetek:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:172
-#, fuzzy
-#| msgid "Organizer"
+#: ../src/balsa-mime-widget-vcalendar.c:189
+#: ../src/balsa-print-object-text.c:547
 msgid "Organizer:"
-msgstr "Organizator"
+msgstr "Organizator:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:173
+#: ../src/balsa-mime-widget-vcalendar.c:191
+#: ../src/balsa-mime-widget-vcalendar.c:377
+#: ../src/balsa-print-object-text.c:549
 msgid "Start:"
 msgstr "Začetek:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:174
+#: ../src/balsa-mime-widget-vcalendar.c:192
+#: ../src/balsa-mime-widget-vcalendar.c:378
+#: ../src/balsa-print-object-text.c:550
 msgid "End:"
 msgstr "Konec:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:175
+#: ../src/balsa-mime-widget-vcalendar.c:196
+#: ../src/balsa-print-object-text.c:554
+msgid "Duration:"
+msgstr "Trajanje:"
+
+#: ../src/balsa-mime-widget-vcalendar.c:202
+#: ../src/balsa-print-object-text.c:560
+msgid "Recurrence:"
+msgstr "Ponovitev:"
+
+#: ../src/balsa-mime-widget-vcalendar.c:206
+#: ../src/balsa-mime-widget-vcalendar.c:379
+#: ../src/balsa-print-object-text.c:564
 msgid "Location:"
 msgstr "Mesto:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:207
+#: ../src/balsa-mime-widget-vcalendar.c:235
+#: ../src/balsa-print-object-text.c:573
 #, fuzzy
 #| msgid "Attendee"
 msgid "Attendee:"
@@ -3935,101 +4564,81 @@ msgstr[1] "Udeleženec"
 msgstr[2] "Udeleženec"
 msgstr[3] "Udeleženec"
 
-#: ../src/balsa-mime-widget-vcalendar.c:211
+#: ../src/balsa-mime-widget-vcalendar.c:243
+#: ../src/balsa-print-object-text.c:602
+msgid "Category:"
+msgid_plural "Categories:"
+msgstr[0] "Kategorija:"
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../src/balsa-mime-widget-vcalendar.c:247
+#: ../src/balsa-mime-widget-vcalendar.c:380
+#: ../src/balsa-print-object-text.c:587
 msgid "Description:"
 msgstr "Opis:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:232
+#: ../src/balsa-mime-widget-vcalendar.c:266
 msgid "The sender asks you for a reply to this request:"
 msgstr "Pošiljatelj zahteva odgovor na to zahtevo:"
 
-#: ../src/balsa-mime-widget-vcalendar.c:239
+#: ../src/balsa-mime-widget-vcalendar.c:273
 msgid "Accept"
 msgstr "Sprejmi"
 
-#: ../src/balsa-mime-widget-vcalendar.c:248
+#: ../src/balsa-mime-widget-vcalendar.c:286
 msgid "Accept tentatively"
 msgstr "Poskusno sprejmi"
 
-#: ../src/balsa-mime-widget-vcalendar.c:256
+#: ../src/balsa-mime-widget-vcalendar.c:294
 msgid "Decline"
 msgstr "Zavrni"
 
-#: ../src/balsa-mime-widget-vcalendar.c:303
+#: ../src/balsa-mime-widget-vcalendar.c:363
 #, fuzzy
 #| msgid "iTip Calendar Request"
 msgid "iTIP Calendar Request"
-msgstr "Zahteva za overitev uporabe koledarja"
+msgstr "Zahteva za overitev uporabe koledarja Google"
+
+#: ../src/balsa-mime-widget-vcalendar.c:374
+#, c-format
+msgid ""
+"%s %s the following iTIP calendar request:\n"
+"\n"
+msgstr ""
 
-#: ../src/balsa-mime-widget-vcalendar.c:333
+#: ../src/balsa-mime-widget-vcalendar.c:407
 #, fuzzy, c-format
 #| msgid "Sending the iTip calendar reply failed: %s"
 msgid "Sending the iTIP calendar reply failed: %s"
 msgstr "Pošiljanje odgovora koledarja iTip je spodletelo: %s"
 
-#: ../src/balsa-print-object-default.c:152
-#: ../src/balsa-print-object-default.c:154
-#: ../src/balsa-print-object-default.c:157
-msgid "Type:"
-msgstr "Vrsta:"
-
-#: ../src/balsa-print-object-default.c:162
-#: ../src/balsa-print-object-default.c:166
+#: ../src/balsa-print-object-default.c:123
+#: ../src/balsa-print-object-default.c:128
 msgid "File name:"
 msgstr "Ime datoteke:"
 
-#: ../src/balsa-print-object-text.c:491
+#: ../src/balsa-print-object-text.c:445
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: ../src/balsa-print-object-text.c:493
+#: ../src/balsa-print-object-text.c:446
 msgid "Nick Name"
 msgstr "Vzdevek"
 
-#: ../src/balsa-print-object-text.c:495
+#: ../src/balsa-print-object-text.c:447
 msgid "First Name"
 msgstr "Ime"
 
-#: ../src/balsa-print-object-text.c:497
+#: ../src/balsa-print-object-text.c:448
 msgid "Last Name"
 msgstr "Priimek"
 
-#: ../src/balsa-print-object-text.c:499
+#: ../src/balsa-print-object-text.c:449
 msgid "Organization"
 msgstr "Organizacija"
 
-#: ../src/balsa-print-object-text.c:649
-msgid "Summary"
-msgstr "Povzetek"
-
-#: ../src/balsa-print-object-text.c:651
-msgid "Organizer"
-msgstr "Organizator"
-
-#: ../src/balsa-print-object-text.c:653
-msgid "Start"
-msgstr "Začetek"
-
-#: ../src/balsa-print-object-text.c:655
-msgid "End"
-msgstr "Konec"
-
-#: ../src/balsa-print-object-text.c:657
-msgid "Location"
-msgstr "Mesto"
-
-#: ../src/balsa-print-object-text.c:666
-msgid "Attendees"
-msgstr "Udeleženci"
-
-#: ../src/balsa-print-object-text.c:666
-msgid "Attendee"
-msgstr "Udeleženec"
-
-#: ../src/balsa-print-object-text.c:680 ../src/sendmsg-window.c:2711
-msgid "Description"
-msgstr "Opis"
-
 #: ../src/filter-edit-callbacks.c:330
 msgid "One of the specified fields contains:"
 msgstr "Eno od navedenih polj vsebuje:"
@@ -4054,7 +4663,7 @@ msgstr "Je skladno, ko je datum v intervalu:"
 msgid "Match when date is outside the interval:"
 msgstr "Je skladno, ko je datum izven intervala:"
 
-#: ../src/filter-edit-callbacks.c:339 ../src/filter-edit-callbacks.c:1142
+#: ../src/filter-edit-callbacks.c:339 ../src/filter-edit-callbacks.c:1133
 msgid "Match when one of these flags is set:"
 msgstr "Je skladno, ko je nastavljena ena od teh zastavic:"
 
@@ -4090,134 +4699,132 @@ msgstr "Zgornja datumska meja je napačna"
 msgid "Low date is greater than high date"
 msgstr "Spodnja datumska meja je kasnejša od zgornje"
 
-#: ../src/filter-edit-callbacks.c:908
+#: ../src/filter-edit-callbacks.c:899
 #, c-format
 msgid "Error displaying condition help: %s\n"
 msgstr "Napaka ob prikazu pomoči pogojev %s\n"
 
-#: ../src/filter-edit-callbacks.c:946
+#: ../src/filter-edit-callbacks.c:937
 msgid "Match Fields"
 msgstr "Primerjaj skladnosti polj"
 
-#: ../src/filter-edit-callbacks.c:960
+#: ../src/filter-edit-callbacks.c:951
 msgid "_All"
 msgstr "_Vse"
 
-#: ../src/filter-edit-callbacks.c:961
+#: ../src/filter-edit-callbacks.c:952
 msgid "C_lear"
 msgstr "Po_čisti"
 
-#: ../src/filter-edit-callbacks.c:963 ../src/main-window.c:3954
+#: ../src/filter-edit-callbacks.c:954 ../src/main-window.c:3824
 msgid "_Body"
 msgstr "_Telo"
 
-#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:3955
+#: ../src/filter-edit-callbacks.c:955 ../src/main-window.c:3825
 msgid "_To:"
 msgstr "_Za:"
 
-#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:3956
+#: ../src/filter-edit-callbacks.c:956 ../src/main-window.c:3826
 msgid "_From:"
 msgstr "_Od:"
 
-#: ../src/filter-edit-callbacks.c:966
+#: ../src/filter-edit-callbacks.c:957
 msgid "_Subject"
 msgstr "Z_adeva"
 
-#: ../src/filter-edit-callbacks.c:967 ../src/main-window.c:3958
-#, fuzzy
+#: ../src/filter-edit-callbacks.c:958 ../src/main-window.c:3828
 msgid "_CC:"
-msgstr "_Kp:"
+msgstr "_Kp: "
 
-#: ../src/filter-edit-callbacks.c:969
+#: ../src/filter-edit-callbacks.c:960
 msgid "_User header:"
 msgstr "Upo_rabniška glava:"
 
-#: ../src/filter-edit-callbacks.c:1000
+#: ../src/filter-edit-callbacks.c:991
 msgid "Unread"
 msgstr "Neprebrano"
 
-#: ../src/filter-edit-callbacks.c:1019
+#: ../src/filter-edit-callbacks.c:1010
 msgid "One of the specified f_ields contains"
 msgstr "Eno od navedenih _polj vsebuje:"
 
-#: ../src/filter-edit-callbacks.c:1030
+#: ../src/filter-edit-callbacks.c:1021
 msgid "Contain/Does _Not Contain"
 msgstr "Vsebuje/_Ne vsebuje"
 
-#: ../src/filter-edit-callbacks.c:1049
+#: ../src/filter-edit-callbacks.c:1040
 msgid "_One of the regular expressions matches"
 msgstr "_Eden od logičnih izrazov je skladen"
 
-#: ../src/filter-edit-callbacks.c:1085
+#: ../src/filter-edit-callbacks.c:1076
 msgid "One _Matches/None Matches"
 msgstr "Eden je _skladen/Noben ni skladen"
 
-#: ../src/filter-edit-callbacks.c:1096
+#: ../src/filter-edit-callbacks.c:1087
 msgid "Filtering using regular expressions is not yet implemented."
 msgstr "Filtriranje z uporabo logičnih izrazov še ni podprto."
 
-#: ../src/filter-edit-callbacks.c:1111
+#: ../src/filter-edit-callbacks.c:1102
 msgid "Match when message date is in the interval:"
 msgstr "Sporočilo je skladno, če je datum sporočila v intervalu:"
 
-#: ../src/filter-edit-callbacks.c:1124
+#: ../src/filter-edit-callbacks.c:1115
 msgid "Inside/outside the date interval"
 msgstr "Znotraj/izven datumskega intervala"
 
-#: ../src/filter-edit-callbacks.c:1165
+#: ../src/filter-edit-callbacks.c:1156
 msgid "Match when one flag is set/when no flag is set"
 msgstr ""
 "Je skladno ko je nastavljena ena zastavica ali ko ni nastavljena nobena"
 
-#: ../src/filter-edit-callbacks.c:1184
+#: ../src/filter-edit-callbacks.c:1175
 msgid "Search T_ype:"
 msgstr "Vrsta _iskanja:"
 
-#: ../src/filter-edit-callbacks.c:1262
+#: ../src/filter-edit-callbacks.c:1253
 msgid "Edit condition for filter: "
 msgstr "Urejanje pogoja za filter: "
 
-#: ../src/filter-edit-callbacks.c:1483 ../src/save-restore.c:1885
+#: ../src/filter-edit-callbacks.c:1475 ../src/save-restore.c:1944
 msgid "Filter with no condition was omitted"
 msgstr "Filter brez pogojev je bil izpuščen"
 
-#: ../src/filter-edit-callbacks.c:1515
+#: ../src/filter-edit-callbacks.c:1501
 #, c-format
 msgid "Error displaying filter help: %s\n"
 msgstr "Napaka med prikazovanjem pomoči filtra: %s\n"
 
-#: ../src/filter-edit-callbacks.c:1714
+#: ../src/filter-edit-callbacks.c:1702
 msgid "New filter"
 msgstr "Nov filter"
 
-#: ../src/filter-edit-callbacks.c:1843
+#: ../src/filter-edit-callbacks.c:1834
 msgid "No filter name specified."
 msgstr "Ime filtra ni podano."
 
-#: ../src/filter-edit-callbacks.c:1848
-#, fuzzy, c-format
-#| msgid "Filter \"%s\" already exists."
+#: ../src/filter-edit-callbacks.c:1839
+#, c-format
 msgid "Filter “%s” already exists."
-msgstr "Mapa %s že obstaja"
+msgstr "Filter %s že obstaja."
 
-#: ../src/filter-edit-callbacks.c:1858
+#: ../src/filter-edit-callbacks.c:1849
 msgid "Filter must have conditions."
 msgstr "Filter mora vsebovati pogoje."
 
-#: ../src/filter-edit-callbacks.c:1944
+#: ../src/filter-edit-callbacks.c:1935
 msgid "Filter has matched"
 msgstr "Filter je izličil zadetke"
 
-#: ../src/filter-edit-callbacks.c:1964
+#: ../src/filter-edit-callbacks.c:1955
 msgid "You must provide a sound to play"
 msgstr "Treba je navesti zvok za predvajanje"
 
-#: ../src/filter-edit-callbacks.c:2146
+#: ../src/filter-edit-callbacks.c:2137
 #, c-format
 msgid "(Example: write December 31, 2000, as %s)"
 msgstr "(Primer: napiši 31. december 2000, kot %s)"
 
-#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:226
+#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:225
 msgid "Simple"
 msgstr "Enostavno"
 
@@ -4265,88 +4872,97 @@ msgstr "ALI"
 msgid "AND"
 msgstr "IN"
 
+#. new button
+#. Translators: button "New" filter
+#: ../src/filter-edit-dialog.c:225
+msgctxt "filter"
+msgid "_New"
+msgstr "_Nov"
+
 #. The name entry
-#: ../src/filter-edit-dialog.c:258
+#: ../src/filter-edit-dialog.c:259
 msgid "_Filter name:"
 msgstr "Ime _filtra:"
 
 #. The filter op-code : "OR" or "AND" all the conditions
-#: ../src/filter-edit-dialog.c:272
+#: ../src/filter-edit-dialog.c:273
 #, fuzzy
 #| msgid "Operation between conditions"
 msgid "Operation between conditions:"
-msgstr "RAZMERE:"
+msgstr "Delovanje"
 
-#: ../src/filter-edit-dialog.c:309
+#: ../src/filter-edit-dialog.c:310 ../ui/main-window.ui.h:19
+#: ../ui/message-window.ui.h:5 ../ui/sendmsg-window.ui.h:13
+#: ../ui/source-viewer.ui.h:3
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: ../src/filter-edit-dialog.c:314
+#. Translators: button "New" filter match
+#: ../src/filter-edit-dialog.c:316
+msgctxt "filter match"
 msgid "Ne_w"
 msgstr "No_v"
 
-#: ../src/filter-edit-dialog.c:346
+#: ../src/filter-edit-dialog.c:348
 msgid "Foreground"
 msgstr "Ospredje"
 
-#: ../src/filter-edit-dialog.c:357
+#: ../src/filter-edit-dialog.c:359
 msgid "Background"
 msgstr "Ozadje"
 
 #. The notification area
-#: ../src/filter-edit-dialog.c:383
+#: ../src/filter-edit-dialog.c:385
 msgid "Notification:"
 msgstr "Obvestilo:"
 
 #. Notification buttons
-#: ../src/filter-edit-dialog.c:395
+#: ../src/filter-edit-dialog.c:397
 msgid "Play sound:"
 msgstr "Predvajaj zvok:"
 
-#: ../src/filter-edit-dialog.c:400
-#, fuzzy
-#| msgid "Use Sound..."
+#: ../src/filter-edit-dialog.c:402
 msgid "Use Sound…"
-msgstr "Uporabi zvočno temo"
+msgstr "Uporabi zvok …"
 
-#: ../src/filter-edit-dialog.c:403 ../src/mailbox-node.c:1111
+#: ../src/filter-edit-dialog.c:405 ../src/mailbox-node.c:1050
 msgid "_Open"
 msgstr "_Odpri"
 
-#: ../src/filter-edit-dialog.c:418
+#: ../src/filter-edit-dialog.c:420
 #, fuzzy
 #| msgid "Popup text:"
 msgid "Pop-up text:"
-msgstr "Pojavi okno opozorila"
+msgstr "Pokaži pojavno okno izbir za samodejno dopolnjevanje"
 
 #. The action area
-#: ../src/filter-edit-dialog.c:435
+#: ../src/filter-edit-dialog.c:437
 msgid "Action to perform:"
 msgstr "Dejanje za izvedbo:"
 
-#: ../src/filter-edit-dialog.c:489
+#: ../src/filter-edit-dialog.c:491
 msgid "Match"
 msgstr "Se sklada"
 
-#: ../src/filter-edit-dialog.c:492
+#: ../src/filter-edit-dialog.c:494
 msgid "Action"
 msgstr "Dejanje"
 
-#: ../src/filter-edit-dialog.c:503
+#: ../src/filter-edit-dialog.c:505
 msgid "Re_vert"
 msgstr "Po&vrni"
 
-#: ../src/filter-edit-dialog.c:554
+#: ../src/filter-edit-dialog.c:556
 msgid "A filter run dialog is open. Close it before you can modify filters."
 msgstr ""
 "Pogovorno okno uporabe filtra je odprto. Pred spreminjanjem filtrov ga je "
 "treba zapreti."
 
-#: ../src/filter-edit-dialog.c:567
+#: ../src/filter-edit-dialog.c:570
 msgid "Filters"
 msgstr "Filtri"
 
-#: ../src/filter-edit-dialog.c:635
+#: ../src/filter-edit-dialog.c:638
 #, fuzzy, c-format
 #| msgid "Filter \"%s\" has no condition."
 msgid "Filter “%s” has no condition."
@@ -4365,28 +4981,26 @@ msgstr ""
 "Pogovorna okna uporabe filtrov so odprta. Pred spreminjanjem filtrov jih je "
 "treba zapreti."
 
-#: ../src/filter-export-dialog.c:75
-#, fuzzy
-#| msgid "_Export Filters..."
+#: ../src/filter-export-dialog.c:76
 msgid "Export Filters"
-msgstr "_Izvozi"
+msgstr "Izvozi filtre"
 
-#: ../src/filter-run-callbacks.c:192
+#: ../src/filter-run-callbacks.c:186
 #, c-format
 msgid "Error displaying run filters help: %s\n"
 msgstr "Napaka med prikazovanjem pomoči uporabe filtrov: %s\n"
 
-#: ../src/filter-run-callbacks.c:242 ../src/filter-run-callbacks.c:264
+#: ../src/filter-run-callbacks.c:236 ../src/filter-run-callbacks.c:258
 msgid "Error when applying filters"
 msgstr "Napaka med uveljavljanjem filtrov"
 
-#: ../src/filter-run-callbacks.c:245 ../src/filter-run-callbacks.c:267
+#: ../src/filter-run-callbacks.c:239 ../src/filter-run-callbacks.c:261
 #, fuzzy, c-format
 #| msgid "Filter applied to \"%s\"."
 msgid "Filter applied to “%s”."
 msgstr "Filtriranje po %s"
 
-#: ../src/filter-run-callbacks.c:306
+#: ../src/filter-run-callbacks.c:298
 #, fuzzy, c-format
 #| msgid ""
 #| "The destination mailbox of the filter \"%s\" is \"%s\".\n"
@@ -4398,7 +5012,7 @@ msgstr ""
 "Ciljni poštni predal filtra \"%s\" je \"%s\"\n"
 "Ni ga mogoče povezati z istim poštnim predalom (to povzroči rekurzijo)."
 
-#: ../src/filter-run-callbacks.c:314
+#: ../src/filter-run-callbacks.c:306
 #, fuzzy, c-format
 #| msgid ""
 #| "The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
@@ -4415,55 +5029,53 @@ msgstr ""
 "To se zgodi, na primer, ko so uporabljeni logični izrazi s poštnimi predali "
 "IMAP. Postopek je zelo počasen, zato uporabite ujemanje podnizov."
 
-#: ../src/filter-run-dialog.c:197
+#: ../src/filter-run-dialog.c:175
 #, fuzzy
 #| msgid "Balsa Filters of Mailbox: "
 msgid "Filters of Mailbox: "
 msgstr "Filtre je mogoče uveljaviti le na poštnem predalu\n"
 
-#: ../src/filter-run-dialog.c:238
+#: ../src/filter-run-dialog.c:218
 msgid "On reception"
 msgstr "Ob sprejemu"
 
-#: ../src/filter-run-dialog.c:250
+#: ../src/filter-run-dialog.c:230
 msgid "On exit"
 msgstr "Ob izhodu"
 
-#: ../src/filter-run-dialog.c:359
-#, fuzzy
-#| msgid "Apply Selected"
+#: ../src/filter-run-dialog.c:343
 msgid "_Apply Selected"
-msgstr "Uveljavi izbrano zaloge."
+msgstr "_Uveljavi izbrano"
 
-#: ../src/filter-run-dialog.c:375
+#: ../src/filter-run-dialog.c:359
 #, fuzzy
 #| msgid "Edit the selected mailbox"
 msgid "Add selected filter to mailbox"
-msgstr "Ni izbranega poštnega predala."
+msgstr "Dodaj filter"
 
-#: ../src/filter-run-dialog.c:385
+#: ../src/filter-run-dialog.c:369
 #, fuzzy
 #| msgid "Remove duplicated messages from the current mailbox"
 msgid "Remove selected filter from mailbox"
 msgstr "Odstrani izbrani filter"
 
-#: ../src/filter-run-dialog.c:427
+#: ../src/filter-run-dialog.c:411
 #, fuzzy
 #| msgid "Save selected to folder..."
 msgid "Move selected filter up"
-msgstr "Pomakni trenutno masko višje"
+msgstr "Premakni trenutno vrstico višje"
 
-#: ../src/filter-run-dialog.c:437
+#: ../src/filter-run-dialog.c:421
 #, fuzzy
 #| msgid "Save selected to folder..."
 msgid "Move selected filter down"
-msgstr "Pomakni trenutno masko nižje"
+msgstr "Premakni trenutno vrstico nižje"
 
-#: ../src/filter-run-dialog.c:443
+#: ../src/filter-run-dialog.c:427
 msgid "A_pply Now!"
 msgstr "_Uveljavi takoj!"
 
-#: ../src/filter-run-dialog.c:489
+#: ../src/filter-run-dialog.c:467
 msgid ""
 "The filters dialog is opened, close it before you can run filters on any "
 "mailbox"
@@ -4471,80 +5083,105 @@ msgstr ""
 "Pogovorno okno filtrov je odprto. Treba ga je zapreti, preden je mogoče "
 "zagnati filtre na kateremkoli predalu."
 
-#: ../src/folder-conf.c:117
+#: ../src/folder-conf.c:111
 #, c-format
 msgid "Error displaying config help: %s\n"
 msgstr "Napaka med prikazovanjem pomoči nastavitev: %s\n"
 
-#: ../src/folder-conf.c:306
+#: ../src/folder-conf.c:201
+#, fuzzy, c-format
+#| msgid "Scanning of %s failed: %s"
+msgid "Changing subscriptions failed: %s"
+msgstr "Preiskovanje %s ni uspelo: %s"
+
+#: ../src/folder-conf.c:323
+#, fuzzy, c-format
+#| msgid "Cannot get IMAP handle"
+msgid "Cannot list IMAP folders: %s"
+msgstr "Ni mogoče dobiti ročice IMAP"
+
+#: ../src/folder-conf.c:372
+msgid "folder"
+msgstr "mapa"
+
+#: ../src/folder-conf.c:385
+#, fuzzy
+#| msgid "_Unsubscribe"
+msgid "subscribed"
+msgstr "Pre_kliči naročnino"
+
+#: ../src/folder-conf.c:408
+#, c-format
+msgid "Manage folder subscriptions of IMAP server “%s”"
+msgstr ""
+
+#: ../src/folder-conf.c:414
+#, fuzzy
+#| msgid "Description"
+msgid "Manage subscriptions"
+msgstr "Opis"
+
+#: ../src/folder-conf.c:464
 msgid "Remote IMAP folder"
 msgstr "Oddaljena mapa IMAP"
 
-#: ../src/folder-conf.c:310 ../src/folder-conf.c:805 ../src/mailbox-conf.c:608
+#: ../src/folder-conf.c:468 ../src/folder-conf.c:841 ../src/mailbox-conf.c:362
 msgid "_Update"
 msgstr "Poso_dobi"
 
-#: ../src/folder-conf.c:310
+#: ../src/folder-conf.c:468
 msgid "C_reate"
 msgstr "Ustva_ri"
 
-#: ../src/folder-conf.c:341
+#: ../src/folder-conf.c:494
+msgid "Subscribed _folders only"
+msgstr "Le _naročene mape"
+
+#: ../src/folder-conf.c:496
+msgid "Manage subscriptions…"
+msgstr ""
+
+#: ../src/folder-conf.c:510
+#, fuzzy
+#| msgid "Always show _INBOX"
+msgid "Always show _Inbox"
+msgstr "Prejeto"
+
+#: ../src/folder-conf.c:512
+msgid "Pr_efix:"
+msgstr "Predp_ona:"
+
+#: ../src/folder-conf.c:519
 msgid "_Max number of connections:"
 msgstr "_Največje število povezav:"
 
-#: ../src/folder-conf.c:347 ../src/mailbox-conf.c:1451
+#: ../src/folder-conf.c:520
 msgid "Enable _persistent cache"
 msgstr "Omogoči _vztrajni predpomnilnik"
 
-#: ../src/folder-conf.c:354
+#: ../src/folder-conf.c:522
 msgid "Use IDLE command"
 msgstr "Uporabi ukaz IDLE"
 
-#: ../src/folder-conf.c:361 ../src/mailbox-conf.c:1454
+#: ../src/folder-conf.c:524
 msgid "Enable _bug workarounds"
 msgstr "Omogoči _izmikanje hroščem"
 
-#: ../src/folder-conf.c:368
+#: ../src/folder-conf.c:526
 msgid "Use STATUS for mailbox checking"
 msgstr "Uporabi STATUS za preverjanje poštnega predala"
 
-#. INPUT FIELD CREATION
-#: ../src/folder-conf.c:377
-msgid "Descriptive _name:"
-msgstr "Opisno _ime:"
-
-#. username
-#: ../src/folder-conf.c:392 ../src/mailbox-conf.c:1303
-msgid "Use_r name:"
-msgstr "Upo_rabniško ime:"
-
-#: ../src/folder-conf.c:398
-msgid "_Password:"
-msgstr "_Geslo:"
+#: ../src/folder-conf.c:609
+#, fuzzy, c-format
+#| msgid "Select parent folder"
+msgid "Select parent folder of “%s”"
+msgstr "Izbor nadrejene mape"
 
-#: ../src/folder-conf.c:405 ../src/mailbox-conf.c:1414
-msgid "_Anonymous access"
-msgstr "_Anonimni dostop"
+#: ../src/folder-conf.c:612
+msgid "Select parent folder"
+msgstr "Izbor nadrejene mape"
 
-#: ../src/folder-conf.c:416
-msgid "Subscribed _folders only"
-msgstr "Le _naročene mape"
-
-#: ../src/folder-conf.c:419
-#, fuzzy
-#| msgid "Always show _INBOX"
-msgid "Always show _Inbox"
-msgstr "Vedno pokaži kazalko besedilnega polja"
-
-#: ../src/folder-conf.c:422
-msgid "Pr_efix:"
-msgstr "Predp_ona:"
-
-#: ../src/folder-conf.c:569
-msgid "Select parent folder"
-msgstr "Izbor nadrejene mape"
-
-#: ../src/folder-conf.c:648
+#: ../src/folder-conf.c:681
 #, fuzzy, c-format
 #| msgid ""
 #| "Renaming INBOX is special!\n"
@@ -4565,31 +5202,31 @@ msgstr ""
 "Dohodni predal in podmape bodo ostali.\n"
 "Kaj želite narediti?"
 
-#: ../src/folder-conf.c:655
+#: ../src/folder-conf.c:688
 msgid "Question"
 msgstr "Vprašanje"
 
-#: ../src/folder-conf.c:659
+#: ../src/folder-conf.c:692
 #, fuzzy
 #| msgid "Rename INBOX"
 msgid "Rename Inbox"
-msgstr "_Dohodni predal:"
+msgstr "Prejeto"
 
-#: ../src/folder-conf.c:661
+#: ../src/folder-conf.c:694
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../src/folder-conf.c:686
+#: ../src/folder-conf.c:721
 #, c-format
 msgid "Folder rename failed. Reason: %s"
 msgstr "Preimenovanje mape ni uspelo. Vzrok: %s"
 
-#: ../src/folder-conf.c:738
+#: ../src/folder-conf.c:773 ../src/folder-conf.c:1133
 #, c-format
 msgid "Folder creation failed. Reason: %s"
 msgstr "Ustvarjanje mape ni uspelo. Vzrok: %s"
 
-#: ../src/folder-conf.c:785
+#: ../src/folder-conf.c:824
 msgid ""
 "An IMAP folder that is not a mailbox\n"
 "has no properties that can be changed."
@@ -4597,70 +5234,62 @@ msgstr ""
 "Mapa IMAP, ki ni poštni predal nima\n"
 "lastnosti, ki bi jih bilo mogoče spremeniti."
 
-#: ../src/folder-conf.c:801
+#: ../src/folder-conf.c:837
 msgid "Remote IMAP subfolder"
 msgstr "Oddaljena podmapa IMAP"
 
-#: ../src/folder-conf.c:805
-msgid "_Create"
-msgstr "_Ustvari"
-
-#: ../src/folder-conf.c:835
-msgid "Create subfolder"
-msgstr "Ustvari podmapo"
-
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:843
+#: ../src/folder-conf.c:873 ../src/folder-conf.c:1106
 msgid "_Folder name:"
 msgstr "Ime _mape:"
 
-#: ../src/folder-conf.c:849
+#: ../src/folder-conf.c:879
 msgid "Host:"
 msgstr "Gostitelj:"
 
-#: ../src/folder-conf.c:858
+#: ../src/folder-conf.c:889 ../src/folder-conf.c:1100
 msgid "Subfolder of:"
 msgstr "Podmapa od:"
 
-#: ../src/folder-conf.c:863
+#: ../src/folder-conf.c:895
 #, fuzzy
 #| msgid "_Browse..."
 msgid "_Browse…"
-msgstr "Pre_brskaj"
+msgstr "Prebrskaj ..."
 
-#: ../src/folder-conf.c:877
+#: ../src/folder-conf.c:907
 msgid "read-only"
 msgstr "le za branje"
 
-#: ../src/folder-conf.c:878
+#: ../src/folder-conf.c:908
 msgid "read-write"
 msgstr "branje-pisanje"
 
-#: ../src/folder-conf.c:879
+#: ../src/folder-conf.c:909
 msgid "admin"
 msgstr "skrbnik"
 
-#: ../src/folder-conf.c:880
+#: ../src/folder-conf.c:910
 msgid "post"
 msgstr "pošlji"
 
-#: ../src/folder-conf.c:881
+#: ../src/folder-conf.c:911
 msgid "append"
 msgstr "pripni"
 
-#: ../src/folder-conf.c:882
+#: ../src/folder-conf.c:912
 msgid "delete"
 msgstr "izbriši"
 
-#: ../src/folder-conf.c:883
+#: ../src/folder-conf.c:913
 msgid "special"
 msgstr "posebno"
 
-#: ../src/folder-conf.c:889
+#: ../src/folder-conf.c:920
 msgid "Permissions:"
 msgstr "Dovoljenja:"
 
-#: ../src/folder-conf.c:896
+#: ../src/folder-conf.c:928
 msgid ""
 "\n"
 "detailed permissions are available only for open folders"
@@ -4668,7 +5297,7 @@ msgstr ""
 "\n"
 "podrobna dovoljena so na voljo le za odprte mape"
 
-#: ../src/folder-conf.c:903
+#: ../src/folder-conf.c:935
 #, fuzzy
 #| msgid ""
 #| "\n"
@@ -4676,34 +5305,34 @@ msgstr ""
 msgid ""
 "\n"
 "the server does not support ACLs"
-msgstr "Strežnik ne podpira protokola PLAIN"
+msgstr "strežnik ne podpira omejitve prostora"
 
-#: ../src/folder-conf.c:912
+#: ../src/folder-conf.c:944
 msgid "mine: "
 msgstr "lastno:"
 
-#: ../src/folder-conf.c:950
+#: ../src/folder-conf.c:981
 msgid "Quota:"
 msgstr "Omejitev prostora:"
 
-#: ../src/folder-conf.c:954
+#: ../src/folder-conf.c:985
 msgid "quota information available only for open folders"
 msgstr "podrobnosti o omejevanju prostora so na voljo le za odprte mape"
 
-#: ../src/folder-conf.c:959
+#: ../src/folder-conf.c:990
 msgid "the server does not support quotas"
 msgstr "strežnik ne podpira omejitve prostora"
 
-#: ../src/folder-conf.c:961
+#: ../src/folder-conf.c:992
 msgid "no limits"
 msgstr "brez omejitev"
 
-#: ../src/folder-conf.c:966
+#: ../src/folder-conf.c:997
 #, c-format
 msgid "%s of %s (%.1f%%) used"
 msgstr "%s od %s (%.1f%%) uporabljeno"
 
-#: ../src/folder-conf.c:1003
+#: ../src/folder-conf.c:1034
 msgid ""
 "This folder is not stored in configuration. I do not yet know how to remove "
 "it from remote server."
@@ -4711,7 +5340,7 @@ msgstr ""
 "Ta mapa ni shranjena v nastavitvah, zato je ni mogoče odstraniti z "
 "oddaljenega strežnika."
 
-#: ../src/folder-conf.c:1012
+#: ../src/folder-conf.c:1043
 #, fuzzy, c-format
 #| msgid ""
 #| "This will remove the folder \"%s\" from the list.\n"
@@ -4724,17 +5353,38 @@ msgstr ""
 "V primeru, da želite mapo kasneje ponovno dodati, lahko uporabite \"Nova "
 "mapa IMAP\".\n"
 
-#: ../src/folder-conf.c:1020
+#: ../src/folder-conf.c:1051
 msgid "Confirm"
 msgstr "Potrdi"
 
+#: ../src/folder-conf.c:1086
+#, fuzzy
+#| msgid "Create subfolder"
+msgid "Create IMAP subfolder"
+msgstr "Ustvari podmapo"
+
+#: ../src/folder-conf.c:1089
+msgid "_Create"
+msgstr "_Ustvari"
+
+#: ../src/folder-conf.c:1102
+msgid "server (top level)"
+msgstr ""
+
+#: ../src/folder-conf.c:1118
+#, c-format
+msgid ""
+"The character “%c” is used as hierarchy separator by the server and "
+"therefore not permitted in the folder name."
+msgstr ""
+
 #: ../src/information-dialog.c:231
 #, fuzzy
 #| msgid "Information - Balsa"
 msgid "Information — Balsa"
 msgstr "Balsa"
 
-#: ../src/information-dialog.c:235 ../src/main-window.c:3975
+#: ../src/information-dialog.c:235 ../src/main-window.c:3845
 msgid "_Clear"
 msgstr "Po_čisti"
 
@@ -4743,47 +5393,26 @@ msgstr "Po_čisti"
 msgid "Cl_ose"
 msgstr "_Zapri brez shranjevanja"
 
-#: ../src/information-dialog.c:358
+#: ../src/information-dialog.c:354
 #, c-format
 msgid "WARNING: "
 msgstr "OPOZORILO: "
 
-#: ../src/information-dialog.c:361
+#: ../src/information-dialog.c:357
 #, c-format
 msgid "ERROR: "
 msgstr "NAPAKA: "
 
-#: ../src/information-dialog.c:364
+#: ../src/information-dialog.c:360
 #, c-format
 msgid "FATAL: "
 msgstr "USODNA NAPAKA: "
 
-#: ../src/mailbox-conf.c:207 ../src/mailbox-conf.c:1536
-#: ../src/pref-manager.c:212 ../src/pref-manager.c:1152
-msgid "Never"
-msgstr "Nikoli"
-
-#: ../src/mailbox-conf.c:208 ../src/mailbox-conf.c:1537
-msgid "If Possible"
-msgstr "Če je mogoče"
-
-#: ../src/mailbox-conf.c:209
-msgid "Required"
-msgstr "Zahtevano"
-
-#: ../src/mailbox-conf.c:224
-msgid "Use _SSL"
-msgstr "Uporabi _SSL"
-
-#: ../src/mailbox-conf.c:229
-msgid "Use _TLS:"
-msgstr "Uporabi _TLS:"
-
-#: ../src/mailbox-conf.c:408
+#: ../src/mailbox-conf.c:153
 msgid "No mailbox selected."
 msgstr "Ni izbranega poštnega predala."
 
-#: ../src/mailbox-conf.c:438
+#: ../src/mailbox-conf.c:183
 #, fuzzy, c-format
 #| msgid ""
 #| "Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
@@ -4798,7 +5427,7 @@ msgstr ""
 "V primeru, da ga zares želite odstraniti, dodelite \n"
 "njegovo delovanje drugemu poštnemu predalu."
 
-#: ../src/mailbox-conf.c:448
+#: ../src/mailbox-conf.c:193
 #, fuzzy, c-format
 #| msgid ""
 #| "This will remove the mailbox \"%s\" from the list of mailboxes.  You may "
@@ -4819,15 +5448,15 @@ msgstr ""
 "dostop do predala uporabite \"Dodaj poštni predal\".\n"
 "Kaj želite narediti?"
 
-#: ../src/mailbox-conf.c:460
+#: ../src/mailbox-conf.c:205
 msgid "Remove from _list"
 msgstr "Odstrani s _seznama"
 
-#: ../src/mailbox-conf.c:461
+#: ../src/mailbox-conf.c:206
 msgid "Remove from list and _disk"
 msgstr "Odstrani s seznama in z _diska"
 
-#: ../src/mailbox-conf.c:469
+#: ../src/mailbox-conf.c:215
 #, fuzzy, c-format
 #| msgid ""
 #| "This will remove the mailbox \"%s\" and all its messages from your IMAP "
@@ -4849,11 +5478,11 @@ msgstr ""
 "podmapo IMAP\".\n"
 "Kaj želite narediti?"
 
-#: ../src/mailbox-conf.c:482
+#: ../src/mailbox-conf.c:228
 msgid "_Remove from server"
 msgstr "_Odstrani s strežnika"
 
-#: ../src/mailbox-conf.c:489
+#: ../src/mailbox-conf.c:235
 #, fuzzy, c-format
 #| msgid ""
 #| "This will remove the mailbox \"%s\" from the list of mailboxes.\n"
@@ -4869,21 +5498,16 @@ msgstr ""
 "predal\".\n"
 "Kaj želite narediti?"
 
-#: ../src/mailbox-conf.c:498
+#: ../src/mailbox-conf.c:244
 msgid "_Remove from list"
 msgstr "_Odstrani s seznama"
 
-#: ../src/mailbox-conf.c:542
+#: ../src/mailbox-conf.c:290
 #, c-format
 msgid "Folder deletion failed. Reason: %s"
 msgstr "Brisanje mape ni uspelo. Vzrok: %s"
 
-#: ../src/mailbox-conf.c:879
-#, c-format
-msgid "%s on %s"
-msgstr "%s na %s"
-
-#: ../src/mailbox-conf.c:1017
+#: ../src/mailbox-conf.c:546
 #, c-format
 msgid ""
 "Rename of %s to %s failed:\n"
@@ -4892,84 +5516,57 @@ msgstr ""
 "Preimenovanje %s v %s ni uspelo:\n"
 "%s"
 
-#: ../src/mailbox-conf.c:1202
-msgid "_Mailbox Name:"
-msgstr "_Ime poštnega predala:"
-
-#: ../src/mailbox-conf.c:1211
+#: ../src/mailbox-conf.c:722
 #, c-format
 msgid "Local %s Mailbox Properties"
 msgstr "Lastnosti krajevnega poštnega predala %s"
 
-#: ../src/mailbox-conf.c:1212
+#: ../src/mailbox-conf.c:723
 #, c-format
 msgid "New Local %s Mailbox"
 msgstr "Nov krajevni poštni predal %s"
 
-#: ../src/mailbox-conf.c:1254
-msgid "Remote Mailbox Configurator"
-msgstr "Nastavitve oddaljenega poštnega predala"
-
-#. mailbox name
-#: ../src/mailbox-conf.c:1282 ../src/mailbox-conf.c:1394
-msgid "Mailbox _name:"
+#: ../src/mailbox-conf.c:758
+msgid "_Mailbox Name:"
 msgstr "_Ime poštnega predala:"
 
-#: ../src/mailbox-conf.c:1294
-#, fuzzy
-msgid "POP3 over SSL (POP3S)"
-msgstr "POP3 preko SSL"
-
-#. password field
-#: ../src/mailbox-conf.c:1308 ../src/mailbox-conf.c:1426
-msgid "Pass_word:"
-msgstr "_Geslo:"
+#: ../src/mailbox-conf.c:786
+msgid "Remote Mailbox Configurator"
+msgstr "Nastavitve oddaljenega poštnega predala"
 
-#: ../src/mailbox-conf.c:1314
+#: ../src/mailbox-conf.c:804
 msgid "_Delete messages from server after download"
 msgstr "Po prejemu _izbriši sporočila s strežnika"
 
-#: ../src/mailbox-conf.c:1318
+#. toggle for check
+#: ../src/mailbox-conf.c:807
 msgid "_Enable check for new mail"
 msgstr "_Omogoči preverjanje za novo pošto"
 
-#: ../src/mailbox-conf.c:1322
+#: ../src/mailbox-conf.c:812
 msgid "_Filter messages through procmail"
 msgstr "_Filtriraj sporočila skozi program procmail"
 
-#: ../src/mailbox-conf.c:1324
+#: ../src/mailbox-conf.c:813
 msgid "Fi_lter Command:"
 msgstr "Ukaz fi_ltra:"
 
-#. toggle for apop
-#: ../src/mailbox-conf.c:1334
+#. advanced - toggle for apop
+#: ../src/mailbox-conf.c:817
 msgid "Disable _APOP"
 msgstr "Onemogoči _APOP"
 
 #. toggle for enabling pipeling
-#: ../src/mailbox-conf.c:1336
+#: ../src/mailbox-conf.c:821
 #, fuzzy
 msgid "Overlap commands"
-msgstr "Ukazi:\n"
-
-#. username
-#: ../src/mailbox-conf.c:1407
-msgid "_Username:"
-msgstr "_Uporabniško ime:"
-
-#: ../src/mailbox-conf.c:1431
-msgid "F_older path:"
-msgstr "_Pot mape:"
+msgstr "Prekrivanje zavihkov"
 
-#: ../src/mailbox-conf.c:1515
+#: ../src/mailbox-conf.c:881
 msgid "_Identity:"
 msgstr "_Istovetnost:"
 
-#: ../src/mailbox-conf.c:1538 ../src/pref-manager.c:1154
-msgid "Always"
-msgstr "Vedno"
-
-#: ../src/mailbox-conf.c:1542
+#: ../src/mailbox-conf.c:899
 msgid ""
 "_Decrypt and check\n"
 "signatures automatically:"
@@ -4977,19 +5574,42 @@ msgstr ""
 "_Dešifriraj in samodejno\n"
 "preveri podpise:"
 
-#: ../src/mailbox-conf.c:1569
+#: ../src/mailbox-conf.c:907 ../src/pref-manager.c:211
+#: ../src/pref-manager.c:1150
+msgid "Never"
+msgstr "Nikoli"
+
+#: ../src/mailbox-conf.c:908
+msgid "If Possible"
+msgstr "Če je mogoče"
+
+#: ../src/mailbox-conf.c:909 ../src/pref-manager.c:1152
+msgid "Always"
+msgstr "Vedno"
+
+#: ../src/mailbox-conf.c:923
 msgid "Show _Recipient column instead of Sender"
 msgstr "Pokaži stolpec _prejemnikov namesto pošiljatelja"
 
-#: ../src/mailbox-conf.c:1583
+#: ../src/mailbox-conf.c:937
 msgid "_Subscribe for new mail check"
 msgstr "_Naroči se za novo preverjanje pošte"
 
-#: ../src/mailbox-node.c:317
+#: ../src/mailbox-conf.c:953
+#, fuzzy
+#| msgid "H_ide messages"
+msgid "_Thread messages"
+msgstr "S_krij sporočila"
+
+#: ../src/mailbox-conf.c:968
+msgid "_Merge threads with the same subject"
+msgstr ""
+
+#: ../src/mailbox-node.c:278
 msgid "The folder edition to be written."
 msgstr "Izvod mape za zapisovanje."
 
-#: ../src/mailbox-node.c:497
+#: ../src/mailbox-node.c:457
 #, fuzzy, c-format
 #| msgid "Scanning %s. Please wait..."
 msgid "Scanning %s. Please wait…"
@@ -4997,7 +5617,7 @@ msgstr ""
 "Odklapljanje %s\n"
 "Počakajte trenutek ..."
 
-#: ../src/mailbox-node.c:513
+#: ../src/mailbox-node.c:473
 #, c-format
 msgid ""
 "Scanning of %s failed: %s\n"
@@ -5006,188 +5626,162 @@ msgstr ""
 "Preiskovanje %s ni uspelo: %s\n"
 "Preverite delovanje omrežja."
 
-#: ../src/mailbox-node.c:515
+#: ../src/mailbox-node.c:475
 #, c-format
 msgid "Scanning of %s failed: %s"
 msgstr "Preiskovanje %s ni uspelo: %s"
 
-#: ../src/mailbox-node.c:1063
+#: ../src/mailbox-node.c:967
+#, fuzzy
+#| msgid "You can apply filters only on mailbox\n"
+msgid "You can apply filters only on mailbox"
+msgstr "Filtre je mogoče uveljaviti le na poštnem predalu\n"
+
+#: ../src/mailbox-node.c:1001
 #, fuzzy
 #| msgid "Local _mbox mailbox..."
 msgid "Local _mbox mailbox…"
-msgstr "Poštni predal Berkeley (mbox)"
+msgstr "Predal ni v obliki mbox."
 
-#: ../src/mailbox-node.c:1065
+#: ../src/mailbox-node.c:1003
 #, fuzzy
 #| msgid "Local Mail_dir mailbox..."
 msgid "Local Mail_dir mailbox…"
 msgstr "Nov krajevni poštni predal %s"
 
-#: ../src/mailbox-node.c:1067
+#: ../src/mailbox-node.c:1005
 #, fuzzy
 #| msgid "Local M_H mailbox..."
 msgid "Local M_H mailbox…"
-msgstr "%A %H.%M"
+msgstr "%H%M"
 
-#: ../src/mailbox-node.c:1069
-#, fuzzy
-#| msgid "Remote _IMAP mailbox..."
-msgid "Remote _IMAP mailbox…"
-msgstr "Za mapo '%s' ni ustreznega poštnega nabiralnika IMAP"
-
-#: ../src/mailbox-node.c:1072
-#, fuzzy
-#| msgid "Remote IMAP folder"
+#: ../src/mailbox-node.c:1008
 msgid "Remote IMAP _folder…"
-msgstr "Oddaljena mapa IMAP"
+msgstr "Oddaljena _mapa IMAP …"
 
-#: ../src/mailbox-node.c:1074
-#, fuzzy
-#| msgid "Remote IMAP subfolder"
+#: ../src/mailbox-node.c:1011
 msgid "Remote IMAP _subfolder…"
-msgstr "Oddaljena podmapa IMAP"
+msgstr "Oddaljena _podmapa IMAP …"
+
+#. Translators: popup menu item "New" mailbox or folder
+#: ../src/mailbox-node.c:1017
+msgctxt "mailbox"
+msgid "_New"
+msgstr "_Nov"
 
 #. clicked on the empty space
-#: ../src/mailbox-node.c:1085 ../src/mailbox-node.c:1101
+#: ../src/mailbox-node.c:1024 ../src/mailbox-node.c:1040
 msgid "_Rescan"
 msgstr "Znova p_reišči"
 
-#: ../src/mailbox-node.c:1095
-#, fuzzy
-#| msgid "_Properties"
+#: ../src/mailbox-node.c:1034
 msgid "_Properties…"
-msgstr "_"
-
-#: ../src/mailbox-node.c:1125
-msgid "_Subscribe"
-msgstr "_Naroči se"
-
-#: ../src/mailbox-node.c:1127
-msgid "_Unsubscribe"
-msgstr "Pre_kliči naročnino"
+msgstr "_Lastnosti »%s«"
 
-#: ../src/mailbox-node.c:1133
+#: ../src/mailbox-node.c:1064
 msgid "Mark as _Inbox"
 msgstr "Označi kot _dohodno pošto"
 
-#: ../src/mailbox-node.c:1135
+#: ../src/mailbox-node.c:1066
 msgid "_Mark as Sentbox"
 msgstr "Označi kot po_slano pošto"
 
-#: ../src/mailbox-node.c:1137
+#: ../src/mailbox-node.c:1068
 msgid "Mark as _Trash"
 msgstr "Označi kot s_meti"
 
-#: ../src/mailbox-node.c:1139
+#: ../src/mailbox-node.c:1070
 msgid "Mark as D_raftbox"
 msgstr "Označi kot osnu_tek"
 
-#: ../src/mailbox-node.c:1142
+#: ../src/mailbox-node.c:1073
 msgid "_Empty trash"
 msgstr "_Izprazni smeti"
 
-#: ../src/mailbox-node.c:1147
+#: ../src/mailbox-node.c:1078
 msgid "_Edit/Apply filters"
 msgstr "_Uredi/Uveljavi filtre"
 
-#: ../src/mailbox-node.c:1234
+#: ../src/mailbox-node.c:1165
 #, fuzzy, c-format
 #| msgid "The path \"%s\" does not lead to a mailbox."
 msgid "The path “%s” does not lead to a mailbox."
 msgstr "Poštni predal %s ni videti kot poštni predal v obliki Maildir."
 
-#: ../src/mailbox-node.c:1247
-#, c-format
-msgid "Local mailbox %s loaded as: %s\n"
-msgstr "Krajevni poštni predal %s je bil naložen kot: %s\n"
-
-#: ../src/mailbox-node.c:1278
-#, c-format
-msgid "Local folder %s\n"
-msgstr "Krajevna mapa %s\n"
-
-#: ../src/main.c:120 ../src/main.c:125 ../src/main.c:131 ../src/main.c:137
-#: ../src/main.c:143
+#: ../src/main.c:107 ../src/main.c:112 ../src/main.c:118 ../src/main.c:124
+#: ../src/main.c:130
 #, fuzzy, c-format
 #| msgid "Balsa cannot open your \"%s\" mailbox."
 msgid "Balsa cannot open your “%s” mailbox."
 msgstr "Ni mogoče odpreti začasnega poštnega predala: %s"
 
-#: ../src/main.c:120
+#: ../src/main.c:107
 msgid "Inbox"
 msgstr "Dohodni predal"
 
-#: ../src/main.c:126
+#: ../src/main.c:113
 msgid "Outbox"
 msgstr "Odhodni predal"
 
-#: ../src/main.c:132
+#: ../src/main.c:119
 msgid "Sentbox"
 msgstr "Poslana pošta"
 
-#: ../src/main.c:138
+#: ../src/main.c:125
 msgid "Draftbox"
 msgstr "Predal osnutkov"
 
-#: ../src/main.c:143
+#: ../src/main.c:130
 msgid "Trash"
 msgstr "Smeti"
 
-#: ../src/main.c:384
+#: ../src/main.c:344
 #, fuzzy
 #| msgid "Compressing mail folders..."
 msgid "Compressing mail folders…"
-msgstr "Napaka med stiskanjem datoteke %s"
+msgstr "Stiskanje datotek"
 
-#: ../src/main.c:648
+#: ../src/main.c:632
 #, fuzzy
 #| msgid "Get new mail on startup"
 msgid "Get new mail on start-up"
 msgstr "Ni mogoče začeti novega prijavnega zaslona."
 
-#: ../src/main.c:650
+#: ../src/main.c:634
 msgid "Compose a new email to EMAIL@ADDRESS"
 msgstr "Sestavi novo elektronsko pošto za ELEKTRONSKI@NASLOV"
 
-#: ../src/main.c:652
+#: ../src/main.c:636
 msgid "Attach file at URI"
 msgstr "Priloži datoteko na URI"
 
-#: ../src/main.c:655
+#: ../src/main.c:638
 msgid "Opens MAILBOXNAME"
 msgstr "Odpre ImePoštnegaPredala"
 
-#: ../src/main.c:655
+#: ../src/main.c:638
 msgid "MAILBOXNAME"
 msgstr "ImePoštnegaPredala"
 
-#: ../src/main.c:658
+#: ../src/main.c:640
 msgid "Opens first unread mailbox"
 msgstr "Odpre prvi neprebran poštni predal"
 
-#: ../src/main.c:661
+#: ../src/main.c:642
 #, fuzzy
 #| msgid "Opens default Inbox on startup"
 msgid "Opens default Inbox on start-up"
 msgstr "ID ali vzdevek sestavnega dela, ki naj se privzeto prikaže ob zagonu."
 
-#: ../src/main.c:664
+#: ../src/main.c:644
 msgid "Prints number unread and unsent messages"
 msgstr "Izpiše število neprebranih in neposlanih sporočil"
 
-#: ../src/main.c:666
-msgid "Debug IMAP connection"
-msgstr "Razhroščevanje povezave IMAP"
-
-#: ../src/main.c:667
-msgid "Show help options"
-msgstr "Pokaži možnosti pomoči"
-
-#: ../src/main.c:668
+#: ../src/main.c:646
 msgid "Show version"
 msgstr "Pokaži različico"
 
-#: ../src/main-window.c:279
+#: ../src/main-window.c:333
 msgid ""
 "Balsa is sending a mail now.\n"
 "Abort sending?"
@@ -5195,61 +5789,61 @@ msgstr ""
 "Balsa sedaj pošilja pošto.\n"
 "Ali naj bo pošiljanje prekinjeno?"
 
-#: ../src/main-window.c:449
+#: ../src/main-window.c:491
 msgid "Subject or Sender Contains:"
 msgstr "Zadeva ali pošiljatelj vsebuje:"
 
-#: ../src/main-window.c:450
+#: ../src/main-window.c:492
 msgid "Subject or Recipient Contains:"
 msgstr "Zadeva ali prejemnik vsebuje:"
 
-#: ../src/main-window.c:451
+#: ../src/main-window.c:493
 msgid "Subject Contains:"
 msgstr "Zadeva vsebuje:"
 
-#: ../src/main-window.c:452
+#: ../src/main-window.c:494
 msgid "Body Contains:"
 msgstr "Telo vsebuje:"
 
-#: ../src/main-window.c:453
+#: ../src/main-window.c:495
 msgid "Older than (days):"
 msgstr "Starejše kot (dni):"
 
-#: ../src/main-window.c:454
+#: ../src/main-window.c:496
 msgid "Old at most (days):"
 msgstr "Staro največ (dni):"
 
-#: ../src/main-window.c:974
+#: ../src/main-window.c:1010
 msgid "translator-credits"
 msgstr ""
 "Matej Urbančič <mateju svn gnome org>\n"
 "Andrej Žnidaršič"
 
-#: ../src/main-window.c:985
+#: ../src/main-window.c:1021
 msgid "The Balsa email client is part of the GNOME desktop environment."
 msgstr "Poštni odjemalec Balsa je del namiznega okolja GNOME."
 
 #. license ?
-#: ../src/main-window.c:990
+#: ../src/main-window.c:1026
 msgid "About Balsa"
 msgstr "O programu"
 
-#: ../src/main-window.c:1012
+#: ../src/main-window.c:1048
 #, fuzzy
 #| msgid "Balsa closes files and connections. Please wait..."
 msgid "Balsa closes files and connections. Please wait…"
 msgstr "Balsa zapira datoteke in povezave. Počakajte ..."
 
-#: ../src/main-window.c:1402
+#: ../src/main-window.c:1447
 msgid "You can apply filters only on mailbox\n"
 msgstr "Filtre je mogoče uveljaviti le na poštnem predalu\n"
 
-#: ../src/main-window.c:1422
+#: ../src/main-window.c:1467
 #, c-format
 msgid "Removing duplicates failed: %s"
 msgstr "Odstranjevanje dvojnikov ni uspelo: %s"
 
-#: ../src/main-window.c:1428
+#: ../src/main-window.c:1473
 #, c-format
 msgid "Removed %d duplicate"
 msgid_plural "Removed %d duplicates"
@@ -5258,11 +5852,11 @@ msgstr[1] "Odstranjen je bil %d dvojnik"
 msgstr[2] "Odstranjena sta bila %d dvojnika"
 msgstr[3] "Odstranjeni so bili %d dvojniki"
 
-#: ../src/main-window.c:1433
+#: ../src/main-window.c:1478
 msgid "No duplicates found"
 msgstr "Ni mogoče najti podvojenih sporočil"
 
-#: ../src/main-window.c:2921
+#: ../src/main-window.c:2968
 #, c-format
 msgid ""
 "Unable to Open Mailbox!\n"
@@ -5271,32 +5865,34 @@ msgstr ""
 "Ni mogoče odpreti poštnega predala!\n"
 "%s."
 
-#: ../src/main-window.c:2956
+#: ../src/main-window.c:2996
 #, c-format
 msgid "Opening %s"
 msgstr "Odpiranje %s"
 
-#: ../src/main-window.c:3269 ../src/main-window.c:3287
+#: ../src/main-window.c:3259 ../src/main-window.c:3414
+#: ../src/main-window.c:3535 ../src/main-window.c:3545
 #, fuzzy
 #| msgid "Checking Mail..."
 msgid "Checking Mail…"
-msgstr "Poteka preverjanje za novo pošto na »%s«"
+msgstr "Preverjanje za novo pošto"
 
-#: ../src/main-window.c:3427
+#: ../src/main-window.c:3497 ../src/main-window.c:3502
+#: ../src/main-window.c:3535 ../src/main-window.c:3540
+msgid "Mailboxes"
+msgstr "Poštni predali"
+
+#: ../src/main-window.c:3498
 #, c-format
 msgid "IMAP mailbox: %s"
 msgstr "Poštni predal IMAP: %s"
 
-#: ../src/main-window.c:3431
+#: ../src/main-window.c:3503
 #, c-format
 msgid "Local mailbox: %s"
 msgstr "Krajevni poštni predal: %s"
 
-#: ../src/main-window.c:3599
-msgid "Finished Checking."
-msgstr "Preverjanje je končano."
-
-#: ../src/main-window.c:3642
+#: ../src/main-window.c:3576
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -5305,74 +5901,69 @@ msgstr[1] "Prejeli ste %d novo sporočilo."
 msgstr[2] "Prejeli ste %d novi sporočili."
 msgstr[3] "Prejeli ste %d nova sporočila."
 
-#: ../src/main-window.c:3645
+#: ../src/main-window.c:3579
 msgid "You have new mail."
 msgstr "Prispelo je novo sporočilo."
 
-#: ../src/main-window.c:3713 ../src/main-window.c:3748
-msgid "Balsa: New mail"
-msgstr "Balsa: nova pošta"
-
-#: ../src/main-window.c:3906
+#: ../src/main-window.c:3779
 msgid "Search mailbox"
 msgstr "Išči v poštnem predalu"
 
-#: ../src/main-window.c:3932
+#: ../src/main-window.c:3802
 msgid "_Search for:"
 msgstr "_Poišči:"
 
 #. builds the toggle buttons to specify fields concerned by
 #. * the search.
-#: ../src/main-window.c:3945
+#: ../src/main-window.c:3815
 msgid "In:"
 msgstr "V:"
 
-#: ../src/main-window.c:3957
+#: ../src/main-window.c:3827
 msgid "S_ubject"
 msgstr "Z_adeva"
 
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:3962
+#: ../src/main-window.c:3832
 msgid "Show only matching messages"
 msgstr "Pokaži le skladna sporočila"
 
 #. Frame with OK button
-#: ../src/main-window.c:3983
+#: ../src/main-window.c:3853
 msgid "Open next matching message"
 msgstr "Odpri naslednje skladno sporočilo"
 
-#: ../src/main-window.c:3995
+#: ../src/main-window.c:3865
 msgid "_Reverse search"
 msgstr "_Vzvratno iskanje"
 
-#: ../src/main-window.c:4000
+#: ../src/main-window.c:3870
 msgid "_Wrap around"
 msgstr "_Prelomi besedilo"
 
-#: ../src/main-window.c:4224
+#: ../src/main-window.c:4090
 #, c-format
 msgid "Could not open trash: %s"
 msgstr "Ni mogoče odpreti smeti: %s"
 
-#: ../src/main-window.c:4359
-#, fuzzy, c-format
-#| msgid "Balsa: %s (readonly)"
+#: ../src/main-window.c:4221
+#, c-format
 msgid "Balsa: %s (read-only)"
-msgstr "%s (le za branje)"
+msgstr "Balsa: %s (le za branje)"
 
-#: ../src/main-window.c:4361
+#: ../src/main-window.c:4223
 #, c-format
 msgid "Balsa: %s"
 msgstr "Balsa: %s"
 
 #. xgettext: this is the first part of the message
 #. * "Shown mailbox: %s with %d messages, %d new, %d hidden".
-#: ../src/main-window.c:4861
+#: ../src/main-window.c:4775
 #, c-format
 msgid "Shown mailbox: %s "
 msgstr "Pokazan poštni predal: %s"
 
-#: ../src/main-window.c:4866
+#: ../src/main-window.c:4780
 #, c-format
 msgid "with %d message"
 msgid_plural "with %d messages"
@@ -5381,7 +5972,7 @@ msgstr[1] "s skupaj %d sporočilom"
 msgstr[2] "s skupaj %d sporočiloma"
 msgstr[3] "s skupaj %d sporočili"
 
-#: ../src/main-window.c:4873
+#: ../src/main-window.c:4787
 #, c-format
 msgid ", %d new"
 msgid_plural ", %d new"
@@ -5390,7 +5981,7 @@ msgstr[1] ", %d novo"
 msgstr[2] ", %d novi"
 msgstr[3] ", %d nova,"
 
-#: ../src/main-window.c:4880
+#: ../src/main-window.c:4794
 #, c-format
 msgid ", %d hidden"
 msgid_plural ", %d hidden"
@@ -5399,212 +5990,206 @@ msgstr[1] ", %d skrito"
 msgstr[2] ", %d skriti"
 msgstr[3] ", %d skrita"
 
-#: ../src/main-window.c:4925
+#: ../src/main-window.c:4839
 #, c-format
 msgid "The next unread message is in %s"
 msgstr "Naslednje neprebrano sporočilo je v %s"
 
-#: ../src/main-window.c:4932
+#: ../src/main-window.c:4846
 #, c-format
 msgid "Do you want to select %s?"
 msgstr "Ali želite izbrati %s?"
 
-#: ../src/message-window.c:303
+#: ../src/message-window.c:308 ../ui/message-window.ui.h:19
 msgid "M_ove"
 msgstr "Pr_emakni"
 
-#: ../src/message-window.c:748
+#: ../src/message-window.c:755
 #, c-format
 msgid "Message from %s: %s"
 msgstr "Sporočilo od %s: %s"
 
-#: ../src/pref-manager.c:210
+#: ../src/pref-manager.c:209
 msgid "While retrieving messages"
 msgstr "Med pridobivanjem sporočil"
 
-#: ../src/pref-manager.c:211
+#: ../src/pref-manager.c:210
 msgid "Until closed"
 msgstr "Do zaprtja"
 
-#: ../src/pref-manager.c:217
+#: ../src/pref-manager.c:216
 msgid "Message number"
 msgstr "Številka sporočila"
 
-#: ../src/pref-manager.c:221
+#: ../src/pref-manager.c:220
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: ../src/pref-manager.c:225
+#: ../src/pref-manager.c:224
 msgid "Flat"
 msgstr "Plosko"
 
-#: ../src/pref-manager.c:227
+#: ../src/pref-manager.c:226
 msgid "JWZ"
 msgstr "JWZ"
 
-#: ../src/pref-manager.c:937
+#: ../src/pref-manager.c:941 ../src/pref-manager.c:3565
+msgid "Unknown"
+msgstr "Neznan"
+
+#: ../src/pref-manager.c:944
 #, c-format
 msgid "%s (default)"
 msgstr "%s (privzeto)"
 
-#: ../src/pref-manager.c:1054
+#: ../src/pref-manager.c:1061
 msgid "Default layout"
 msgstr "Privzeta razporeditev"
 
-#: ../src/pref-manager.c:1055
+#: ../src/pref-manager.c:1062
 msgid "Wide message layout"
 msgstr "Široka razporeditev sporočila"
 
-#: ../src/pref-manager.c:1056
+#: ../src/pref-manager.c:1063
 msgid "Wide screen layout"
 msgstr "Širokozaslonska razporeditev"
 
-#: ../src/pref-manager.c:1064
+#: ../src/pref-manager.c:1071
 msgid "Show next unread message"
 msgstr "Pokaži naslednje neprebrano sporočilo"
 
-#: ../src/pref-manager.c:1065
+#: ../src/pref-manager.c:1072
 msgid "Show next message"
 msgstr "Pokaži naslednje sporočilo"
 
-#: ../src/pref-manager.c:1066
+#: ../src/pref-manager.c:1073
 msgid "Close message window"
 msgstr "Zapri okno sporočila"
 
-#: ../src/pref-manager.c:1120
+#: ../src/pref-manager.c:1118
 #, fuzzy, c-format
 #| msgid "Error displaying help: %s\n"
 msgid "Error displaying %s: %s\n"
 msgstr "Napaka med prikazovanjem pomoči: %s\n"
 
-#: ../src/pref-manager.c:1133
+#: ../src/pref-manager.c:1131
 msgid "Show nothing"
 msgstr "Ne pokaži ničesar"
 
-#: ../src/pref-manager.c:1135
+#: ../src/pref-manager.c:1133
 msgid "Show dialog"
 msgstr "Pokaži pogovorno okno"
 
-#: ../src/pref-manager.c:1137
+#: ../src/pref-manager.c:1135
 msgid "Show in list"
 msgstr "Pokaži v seznamu"
 
-#: ../src/pref-manager.c:1139
+#: ../src/pref-manager.c:1137
 msgid "Show in status bar"
 msgstr "Pokaži v vrstici stanja"
 
-#: ../src/pref-manager.c:1141
+#: ../src/pref-manager.c:1139
 msgid "Print to console"
 msgstr "Natisni v konzolo"
 
-#: ../src/pref-manager.c:1153
+#: ../src/pref-manager.c:1151
 msgid "Ask me"
 msgstr "Vprašaj me"
 
-#: ../src/pref-manager.c:1701
-#, fuzzy
-#| msgid "Remote POP3 mailbox..."
+#: ../src/pref-manager.c:1687
 msgid "Remote POP3 mailbox…"
-msgstr "Oddaljeni strežniki poštnega predala"
-
-#: ../src/pref-manager.c:1705
-#, fuzzy
-#| msgid "Remote IMAP mailbox..."
-msgid "Remote IMAP mailbox…"
-msgstr "Za mapo '%s' ni ustreznega poštnega nabiralnika IMAP"
+msgstr "Oddaljeni poštni predal POP3 …"
 
-#: ../src/pref-manager.c:1709
-#, fuzzy
-#| msgid "Remote IMAP folder"
+#: ../src/pref-manager.c:1691 ../ui/main-window.ui.h:7
 msgid "Remote IMAP folder…"
-msgstr "Oddaljena mapa IMAP"
+msgstr "Oddaljena mapa IMAP …"
 
-#: ../src/pref-manager.c:1970
+#: ../src/pref-manager.c:1952
 msgid "Remote mailbox servers"
 msgstr "Oddaljeni strežniki poštnega predala"
 
-#: ../src/pref-manager.c:1987 ../src/pref-manager.c:2752
-#: ../src/sendmsg-window.c:2681
+#: ../src/pref-manager.c:1969 ../src/pref-manager.c:2720
+#: ../src/sendmsg-window.c:2634
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../src/pref-manager.c:1995
+#: ../src/pref-manager.c:1977
 msgid "Mailbox name"
 msgstr "Ime poštnega predala"
 
-#: ../src/pref-manager.c:2017 ../src/pref-manager.c:2100
-#: ../src/pref-manager.c:2795
+#: ../src/pref-manager.c:1999 ../src/pref-manager.c:2082
+#: ../src/pref-manager.c:2763
 msgid "_Modify"
 msgstr "_Spremeni"
 
-#: ../src/pref-manager.c:2039
+#: ../src/pref-manager.c:2021
 msgid "Local mail directory"
 msgstr "Krajevna poštna mapa"
 
-#: ../src/pref-manager.c:2042
+#: ../src/pref-manager.c:2024
 msgid "Select your local mail directory"
 msgstr "Izberite svojo krajevno poštno mapo"
 
-#: ../src/pref-manager.c:2066
+#: ../src/pref-manager.c:2048
 msgid "Outgoing mail servers"
 msgstr "Odhodni poštni strežniki"
 
-#: ../src/pref-manager.c:2084
+#: ../src/pref-manager.c:2066
 msgid "Server name"
 msgstr "Ime strežnika"
 
-#: ../src/pref-manager.c:2128
+#: ../src/pref-manager.c:2110
 msgid "Checking"
 msgstr "Preverjanje"
 
-#: ../src/pref-manager.c:2131
+#: ../src/pref-manager.c:2113
 msgid "_Check mail automatically every"
 msgstr "Samodejno _preveri pošto vsakih"
 
-#: ../src/pref-manager.c:2139 ../src/pref-manager.c:2311
-#: ../src/pref-manager.c:2926 ../src/pref-manager.c:2975
+#: ../src/pref-manager.c:2121 ../src/pref-manager.c:2293
+#: ../src/pref-manager.c:2892 ../src/pref-manager.c:2941
 msgid "minutes"
 msgstr "minut"
 
-#: ../src/pref-manager.c:2144
+#: ../src/pref-manager.c:2126
 msgid "Check _IMAP mailboxes"
 msgstr "Preveri poštne predale _IMAP"
 
-#: ../src/pref-manager.c:2148
+#: ../src/pref-manager.c:2130
 #, fuzzy
 #| msgid "Check INBOX _only"
 msgid "Check Inbox _only"
 msgstr "Preveri _le dohoden predal"
 
-#: ../src/pref-manager.c:2153
+#: ../src/pref-manager.c:2135
 msgid "When mail arrives:"
 msgstr "Ko pošta prispe:"
 
-#: ../src/pref-manager.c:2158
+#: ../src/pref-manager.c:2140
 msgid "Display message"
 msgstr "Prikaži sporočilo"
 
-#: ../src/pref-manager.c:2163
+#: ../src/pref-manager.c:2145
 msgid "Play sound"
 msgstr "Predvajaj zvok"
 
-#: ../src/pref-manager.c:2168
+#: ../src/pref-manager.c:2150
 msgid "Show icon"
 msgstr "Pokaži ikono"
 
-#: ../src/pref-manager.c:2175
+#: ../src/pref-manager.c:2157
 msgid "Do background check quietly (no messages in status bar)"
 msgstr "Tiho preverjaj za pošto v ozadju (brez sporočil v vrstici stanja)"
 
-#: ../src/pref-manager.c:2178
+#: ../src/pref-manager.c:2160
 msgid "_POP message size limit:"
 msgstr "Omejitev velikosti sporočila _POP:"
 
-#: ../src/pref-manager.c:2207
+#: ../src/pref-manager.c:2189
 msgid "Message disposition notification requests"
 msgstr "Zahteve po obvestilih o prejetju"
 
-#: ../src/pref-manager.c:2212
+#: ../src/pref-manager.c:2194
 msgid ""
 "When I receive a message whose sender requested a Message Disposition "
 "Notification (MDN), send it if:"
@@ -5612,7 +6197,7 @@ msgstr ""
 "Ob prejemu sporočila, katerega pošiljatelj je zahteval obvestilo o prejemu, "
 "bo poslano v primeru, da:"
 
-#: ../src/pref-manager.c:2220
+#: ../src/pref-manager.c:2202
 #, fuzzy
 #| msgid ""
 #| "The message header looks clean\n"
@@ -5626,300 +6211,315 @@ msgstr ""
 "(naslov za obvestilo je enak kot povratna pot,\n"
 "vaš naslov pa je v vrstici \"Za:\" ali \"Kp:\")."
 
-#: ../src/pref-manager.c:2234
+#: ../src/pref-manager.c:2216
 msgid "The message header looks suspicious."
 msgstr "Glava sporočila je videti sumljiva."
 
-#: ../src/pref-manager.c:2258
+#: ../src/pref-manager.c:2240
 msgid "Word wrap"
 msgstr "Prelom besed"
 
-#: ../src/pref-manager.c:2261
+#: ../src/pref-manager.c:2243
 msgid "Wrap outgoing text at"
 msgstr "Prelomi izhodno besedilo na"
 
-#: ../src/pref-manager.c:2270 ../src/pref-manager.c:2525
+#: ../src/pref-manager.c:2252 ../src/pref-manager.c:2502
 msgid "characters"
 msgstr "znakih"
 
-#: ../src/pref-manager.c:2289
+#: ../src/pref-manager.c:2271
 msgid "Other options"
 msgstr "Druge možnosti"
 
-#: ../src/pref-manager.c:2291
+#: ../src/pref-manager.c:2273
 msgid "Reply prefix:"
 msgstr "Predpona odgovora:"
 
-#: ../src/pref-manager.c:2294
+#: ../src/pref-manager.c:2276
 msgid "Automatically quote original when replying"
 msgstr "Ob odgovarjanju samodejno navedi izvirnik"
 
-#: ../src/pref-manager.c:2297
+#: ../src/pref-manager.c:2279
 msgid "Forward a mail as attachment instead of quoting it"
 msgstr "Posreduj pošto kot prilogo namesto navajanja v sporočilu"
 
-#: ../src/pref-manager.c:2300
+#: ../src/pref-manager.c:2282
 msgid "Copy outgoing messages to sentbox"
 msgstr "Kopiraj odhodna sporočila v predal poslane pošte"
 
-#: ../src/pref-manager.c:2302
+#: ../src/pref-manager.c:2284
 msgid "Send button always queues outgoing mail in outbox"
 msgstr "Gumb pošlji vedno postavi odhodno pošto v vrsto v odhodni predal"
 
-#: ../src/pref-manager.c:2306
+#: ../src/pref-manager.c:2288
 #, fuzzy
 #| msgid "_Check mail automatically every"
 msgid "_Send queued mail automatically every"
 msgstr "Samodejno _preveri pošto vsakih"
 
-#: ../src/pref-manager.c:2316
+#: ../src/pref-manager.c:2298
 msgid "Edit headers in external editor"
 msgstr "Uredi glave v zunanjem urejevalniku"
 
-#: ../src/pref-manager.c:2318
+#: ../src/pref-manager.c:2300
 msgid "Include HTML parts as text when replying or forwarding"
 msgstr ""
 "Ob odgovarjanju ali posredovanju vključi dele HTML kot običajno besedilo"
 
-#: ../src/pref-manager.c:2336 ../src/toolbar-prefs.c:170
+#: ../src/pref-manager.c:2318 ../src/toolbar-prefs.c:158
 msgid "Main window"
 msgstr "Glavno okno"
 
-#: ../src/pref-manager.c:2339
+#: ../src/pref-manager.c:2321
 msgid "Use preview pane"
 msgstr "Uporabi pladenj predogleda"
 
-#: ../src/pref-manager.c:2343
+#: ../src/pref-manager.c:2325
 #, fuzzy
 #| msgid "Could not access message %u in mailbox \"%s\"."
 msgid "Show message counts in mailbox list"
 msgstr "Pokaži izbrisana sporočila na seznamu sporočil"
 
-#: ../src/pref-manager.c:2349
+#: ../src/pref-manager.c:2331
 msgid "Automatically view message when mailbox opened"
 msgstr "Samodejno poglej sporočilo ob odprtju poštnega predala"
 
-#: ../src/pref-manager.c:2352
+#: ../src/pref-manager.c:2334
 msgid "Ask me before selecting a different mailbox to show an unread message"
 msgstr ""
 "Vprašaj me pred izbiro drugega poštnega predala za prikaz neprebranega "
 "sporočila"
 
-#: ../src/pref-manager.c:2356
+#: ../src/pref-manager.c:2338
 #, fuzzy
 #| msgid "PageUp/PageDown keys scroll text by"
 msgid "Page Up/Page Down keys scroll text by"
 msgstr "Tipki StranGor in StranDol premakneta besedilo za"
 
-#: ../src/pref-manager.c:2364
+#: ../src/pref-manager.c:2346
 msgid "percent"
 msgstr "odstotkov"
 
-#: ../src/pref-manager.c:2381 ../src/toolbar-prefs.c:192
+#: ../src/pref-manager.c:2363 ../src/toolbar-prefs.c:176
 msgid "Message window"
 msgstr "Okno sporočila"
 
-#: ../src/pref-manager.c:2383
+#: ../src/pref-manager.c:2365
 msgid "After moving a message:"
 msgstr "Po premikanju sporočila:"
 
-#: ../src/pref-manager.c:2404
+#: ../src/pref-manager.c:2386
 msgid "Sorting and threading"
 msgstr "Razvrščanje in nitenje"
 
-#: ../src/pref-manager.c:2406
+#: ../src/pref-manager.c:2388
 msgid "Default sort column:"
 msgstr "Privzet stolpec razvrščanja:"
 
-#: ../src/pref-manager.c:2413
-msgid "Default threading style:"
-msgstr "Privzet slog nitenja:"
+#: ../src/pref-manager.c:2396
+#, fuzzy
+#| msgid "sign messages by default"
+msgid "Thread messages by default"
+msgstr "samodejno podpiši sporočila"
 
-#: ../src/pref-manager.c:2421
+#: ../src/pref-manager.c:2398
 msgid "Expand threads on open"
 msgstr "Ob odprtju razširi niti"
 
-#: ../src/pref-manager.c:2446 ../src/print-gtk.c:506
+#. fonts
+#: ../src/pref-manager.c:2423 ../src/print-gtk.c:587
 msgid "Fonts"
 msgstr "Pisave"
 
-#: ../src/pref-manager.c:2449
+#: ../src/pref-manager.c:2426
 msgid "Use system fonts"
 msgstr "Uporabi sistemske pisave"
 
-#: ../src/pref-manager.c:2457
+#: ../src/pref-manager.c:2434
 msgid "Use default font size"
 msgstr "Uporabi privzeto velikost pisave"
 
-#: ../src/pref-manager.c:2463
+#: ../src/pref-manager.c:2440
 msgid "Message font:"
 msgstr "Pisava sporočila:"
 
-#: ../src/pref-manager.c:2470
+#: ../src/pref-manager.c:2447
 msgid "Subject font:"
 msgstr "Pisava zadeve:"
 
 #. Quoted text regular expression
 #. and RFC2646-style flowed text
-#: ../src/pref-manager.c:2510
+#: ../src/pref-manager.c:2487
 msgid "Quoted and flowed text"
 msgstr "Navedeno in povezano besedilo"
 
-#: ../src/pref-manager.c:2513
+#: ../src/pref-manager.c:2490
 msgid "Mark quoted text"
 msgstr "Označi navedeno besedilo"
 
-#: ../src/pref-manager.c:2516
+#: ../src/pref-manager.c:2493
 #, fuzzy
 #| msgid ""
 #| "Quoted text\n"
 #| "regular expression:"
 msgid "Quoted text regular expression:"
-msgstr "Ali je iskalni niz zapisan kot logični izraz."
+msgstr "Iskalni niz je logični izraz"
 
-#: ../src/pref-manager.c:2519
+#: ../src/pref-manager.c:2496
 msgid "Wrap text at"
 msgstr "Prelomi besedilo na"
 
 #. handling of multipart/alternative
-#: ../src/pref-manager.c:2542
+#: ../src/pref-manager.c:2519
 msgid "Display of multipart/alternative parts"
 msgstr "Prikaži večdelne/dodatne dele"
 
-#: ../src/pref-manager.c:2546
+#: ../src/pref-manager.c:2523 ../src/print-gtk.c:609
 #, fuzzy
 #| msgid "Prefer text/plain over html"
 msgid "Prefer text/plain over HTML"
 msgstr "Ali naj imajo ikone prednost pred besedilom"
 
-#: ../src/pref-manager.c:2562
+#: ../src/pref-manager.c:2539
 msgid "Message colors"
 msgstr "Barve sporočila"
 
-#: ../src/pref-manager.c:2567
+#: ../src/pref-manager.c:2544
 #, c-format
 msgid "Quote level %d color"
 msgstr "%d barva ravni navedbe"
 
-#: ../src/pref-manager.c:2585
+#: ../src/pref-manager.c:2562
 msgid "Link color"
 msgstr "Barva povezave"
 
-#: ../src/pref-manager.c:2587
+#: ../src/pref-manager.c:2564
 msgid "Hyperlink color"
 msgstr "Barva hiperpovezave"
 
-#: ../src/pref-manager.c:2602 ../src/pref-manager.c:3217
+#: ../src/pref-manager.c:2579 ../src/pref-manager.c:3183
 msgid "Format"
 msgstr "Oblika"
 
-#: ../src/pref-manager.c:2605
+#: ../src/pref-manager.c:2582
 msgid "Date encoding (for strftime):"
 msgstr "Kodiranje datuma (za strftime):"
 
-#: ../src/pref-manager.c:2607
+#: ../src/pref-manager.c:2584
 msgid "Selected headers:"
 msgstr "Izbrane glave:"
 
 #. treatment of messages with 8-bit chars, but without proper MIME encoding
-#: ../src/pref-manager.c:2625
+#: ../src/pref-manager.c:2602
 msgid "National (8-bit) characters in broken messages without codeset header"
 msgstr ""
 "Nacionalni (8-bitni) znaki v besedilu sporočila brez podatkov o naboru."
 
-#: ../src/pref-manager.c:2630
+#: ../src/pref-manager.c:2607
 #, fuzzy
 #| msgid "display as \"?\""
 msgid "display as “?”"
-msgstr "[Prikaz]"
+msgstr "PRIKAZ"
 
-#: ../src/pref-manager.c:2638
+#: ../src/pref-manager.c:2615
 msgid "display in codeset"
 msgstr "prikaži v kodnem naboru"
 
-#: ../src/pref-manager.c:2663
+#: ../src/pref-manager.c:2640
 msgid "Information messages"
 msgstr "Sporočila podrobnosti"
 
-#: ../src/pref-manager.c:2667
+#: ../src/pref-manager.c:2644
 msgid "Information messages:"
 msgstr "Sporočila podrobnosti:"
 
-#: ../src/pref-manager.c:2671
+#: ../src/pref-manager.c:2648
 msgid "Warning messages:"
 msgstr "Sporočila opozoril:"
 
-#: ../src/pref-manager.c:2675
+#: ../src/pref-manager.c:2652
 msgid "Error messages:"
 msgstr "Sporočila napak:"
 
-#: ../src/pref-manager.c:2679
+#: ../src/pref-manager.c:2656
 msgid "Fatal error messages:"
 msgstr "Sporočila usodnih napak:"
 
-#: ../src/pref-manager.c:2683
+#: ../src/pref-manager.c:2660
 msgid "Debug messages:"
 msgstr "Sporočila razhroščevanja:"
 
-#: ../src/pref-manager.c:2701
+#: ../src/pref-manager.c:2676
 msgid "Display progress dialog"
 msgstr "Pokaži pogovorno okno napredovanja"
 
-#: ../src/pref-manager.c:2732 ../src/pref-manager.c:3350
+#: ../src/pref-manager.c:2677
+#, fuzzy
+#| msgid "Display progress dialog"
+msgid "Display progress dialog when sending messages"
+msgstr "Pokaži pogovorno okno napredovanja"
+
+#: ../src/pref-manager.c:2678
+#, fuzzy
+#| msgid "Display progress dialog"
+msgid "Display progress dialog when retrieving messages"
+msgstr "Pokaži pogovorno okno napredovanja"
+
+#: ../src/pref-manager.c:2700 ../src/pref-manager.c:3312
 msgid "Address books"
 msgstr "Imeniki"
 
-#: ../src/pref-manager.c:2760
+#: ../src/pref-manager.c:2728
 msgid "Address book name"
 msgstr "Ime imenika"
 
-#: ../src/pref-manager.c:2768
+#: ../src/pref-manager.c:2736
 msgid "Auto-complete"
 msgstr "Samodejno zaključevanje"
 
-#: ../src/pref-manager.c:2801
+#: ../src/pref-manager.c:2769
 msgid "_Set as default"
 msgstr "_Nastavi kot privzeto"
 
-#: ../src/pref-manager.c:2818
+#: ../src/pref-manager.c:2786
 msgid "Miscellaneous spelling settings"
 msgstr "Različne nastavitve črkovanja"
 
-#: ../src/pref-manager.c:2822
+#: ../src/pref-manager.c:2790
 msgid "Check signature"
 msgstr "Preveri podpis"
 
-#: ../src/pref-manager.c:2824
+#: ../src/pref-manager.c:2792
 msgid "Check quoted"
 msgstr "Preveri navedeno"
 
-#: ../src/pref-manager.c:2840
+#: ../src/pref-manager.c:2808
 #, fuzzy
 #| msgid "Startup options"
 msgid "Start-up options"
-msgstr "Začetni profil:"
+msgstr "Pokaži čarovnika prvega zagona"
 
-#: ../src/pref-manager.c:2843
+#: ../src/pref-manager.c:2811
 #, fuzzy
 #| msgid "Open Inbox upon startup"
 msgid "Open Inbox upon start-up"
 msgstr "Ob zagonu odpri dohodno pošto"
 
-#: ../src/pref-manager.c:2845
+#: ../src/pref-manager.c:2813
 #, fuzzy
 #| msgid "Check mail upon startup"
 msgid "Check mail upon start-up"
 msgstr "Ob zagonu preveri pošto"
 
-#: ../src/pref-manager.c:2847
+#: ../src/pref-manager.c:2815
 msgid "Remember open mailboxes between sessions"
 msgstr "Zapomni si odprte poštne predale med sejami"
 
-#: ../src/pref-manager.c:2865
+#: ../src/pref-manager.c:2833
 msgid "Folder scanning"
 msgstr "Preiskovanje map"
 
-#: ../src/pref-manager.c:2868
+#: ../src/pref-manager.c:2836
 #, fuzzy
 #| msgid ""
 #| "Choose depth 1 for fast startup; this defers scanning some folders.  To "
@@ -5932,38 +6532,34 @@ msgstr ""
 "V primeru, da želite ob zagonu videti večji del drevesa, izberite večjo "
 "globino."
 
-#: ../src/pref-manager.c:2875
+#: ../src/pref-manager.c:2843
 msgid "Scan local folders to depth"
 msgstr "Preiskovanje krajevnih map do globine"
 
-#: ../src/pref-manager.c:2884
+#: ../src/pref-manager.c:2852
 msgid "Scan IMAP folders to depth"
 msgstr "Preiskovanje map IMAP do globine"
 
-#: ../src/pref-manager.c:2906 ../src/pref-manager.c:3364
+#: ../src/pref-manager.c:2874 ../src/pref-manager.c:3326
 msgid "Miscellaneous"
 msgstr "Različno"
 
-#: ../src/pref-manager.c:2909
-msgid "Debug"
-msgstr "Razhroščevanje"
-
-#: ../src/pref-manager.c:2911
+#: ../src/pref-manager.c:2877
 msgid "Empty trash on exit"
 msgstr "Ob izhodu izprazni smeti"
 
-#: ../src/pref-manager.c:2915
+#: ../src/pref-manager.c:2881
 msgid "Close mailbox if unused more than"
 msgstr "Zapri poštni predal, če ni uporabljen več kot"
 
-#: ../src/pref-manager.c:2943
+#: ../src/pref-manager.c:2909
 msgid "Deleting messages"
 msgstr "Brisanje sporočil"
 
 #. Translators: this used to be "using Mailbox -> Hide messages";
 #. * the UTF-8 string for the right-arrow symbol is broken out to
 #. * avoid msgconv problems.
-#: ../src/pref-manager.c:2948
+#: ../src/pref-manager.c:2914
 #, c-format
 msgid ""
 "The following setting is global, but may be overridden for the selected "
@@ -5972,98 +6568,91 @@ msgstr ""
 "Nastavitev je splošna, vendar jo je mogoče za izbrane poštne predale "
 "prepisati s skritimi %s sporočili poštnega predala:"
 
-#: ../src/pref-manager.c:2956
+#: ../src/pref-manager.c:2922
 msgid "Hide messages marked as deleted"
 msgstr "Skrij sporočila označena kot izbrisana"
 
-#: ../src/pref-manager.c:2958
+#: ../src/pref-manager.c:2924
 msgid "The following settings are global:"
 msgstr "Naslednje nastavitve so splošne:"
 
-#: ../src/pref-manager.c:2961
+#: ../src/pref-manager.c:2927
 msgid "Expunge deleted messages when mailbox is closed"
 msgstr "Samodejno uniči izbrisana sporočila ob zaprtju poštnega predala"
 
-#: ../src/pref-manager.c:2965
+#: ../src/pref-manager.c:2931
 #, fuzzy
 #| msgid "...and if unused more than"
 msgid "…and if unused more than"
 msgstr "Zapri poštni predal, če ni uporabljen več kot"
 
-#: ../src/pref-manager.c:3182
+#: ../src/pref-manager.c:3148
 msgid "Mail options"
 msgstr "Možnosti pošte"
 
-#: ../src/pref-manager.c:3186
+#: ../src/pref-manager.c:3152
 msgid "Incoming"
 msgstr "Dohodna"
 
-#: ../src/pref-manager.c:3190
+#: ../src/pref-manager.c:3156
 msgid "Outgoing"
 msgstr "Odhodna"
 
-#: ../src/pref-manager.c:3201
+#: ../src/pref-manager.c:3167
 msgid "Display options"
 msgstr "Možnosti prikaza"
 
-#: ../src/pref-manager.c:3205
+#: ../src/pref-manager.c:3171
 msgid "Sort and thread"
 msgstr "Razvrsti in ustvari niten seznam"
 
-#: ../src/pref-manager.c:3209 ../src/print-gtk.c:497
+#: ../src/pref-manager.c:3175 ../src/print-gtk.c:579
 msgid "Message"
 msgstr "Sporočilo"
 
-#: ../src/pref-manager.c:3213
+#: ../src/pref-manager.c:3179
 msgid "Colors"
 msgstr "Barve"
 
-#: ../src/pref-manager.c:3221
+#: ../src/pref-manager.c:3187
 msgid "Status messages"
 msgstr "Sporočila stanja"
 
 #. must NOT be modal
-#: ../src/pref-manager.c:3292
+#: ../src/pref-manager.c:3254
 msgid "Balsa Preferences"
 msgstr "Možnosti programa"
 
-#: ../src/pref-manager.c:3355 ../src/toolbar-factory.c:166
+#: ../src/pref-manager.c:3317 ../src/toolbar-factory.c:141
 msgid "Spelling"
 msgstr "Črkovanje"
 
-#: ../src/pref-manager.c:3360
+#: ../src/pref-manager.c:3322
 #, fuzzy
 #| msgid "Startup"
 msgid "Start-up"
 msgstr "Zagon"
 
-#: ../src/print-gtk.c:89 ../src/print-gtk.c:248
+#: ../src/print-gtk.c:94 ../src/print-gtk.c:307
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stran %d od %d"
 
-#: ../src/print-gtk.c:143 ../src/print-gtk.c:169
-msgid "Signed and encrypted matter"
+#: ../src/print-gtk.c:168
+#, fuzzy
+#| msgid "Signed and encrypted matter"
+msgid "Signed and encrypted"
 msgstr "Šifrirana in podpisana zadeva"
 
-#: ../src/print-gtk.c:147 ../src/print-gtk.c:173
-msgid "Signed matter"
-msgstr "Podpisana zadeva"
-
-#: ../src/print-gtk.c:154
-msgid "Encrypted matter"
-msgstr "Šifrirana zadeva"
-
-#: ../src/print-gtk.c:197
-#, c-format
-msgid "This is an inline %s signed %s message part:"
-msgstr "Medvrstični %s podpisani %s del besedila:"
+#: ../src/print-gtk.c:170
+msgid "Signed"
+msgstr "Podpisano"
 
-#: ../src/print-gtk.c:199
-msgid "OpenPGP"
-msgstr "OpenPGP"
+#: ../src/print-gtk.c:173
+msgid "Encrypted"
+msgstr "Šifrirano"
 
-#: ../src/print-gtk.c:352
+#: ../src/print-gtk.c:414
 #, c-format
 msgid "Cannot print page %d because the document has only %d page."
 msgid_plural "Cannot print page %d because the document has only %d pages."
@@ -6078,72 +6667,79 @@ msgstr[3] "Strani %d ni mogoče natisniti, ker ima dokument samo %d strani."
 #. * Do *not* translate it to "predefinito:mm", if it
 #. * it isn't default:mm or default:inch it will not work
 #.
-#: ../src/print-gtk.c:390
+#: ../src/print-gtk.c:452
 msgid "default:mm"
 msgstr "privzeto:mm"
 
-#: ../src/print-gtk.c:446
+#: ../src/print-gtk.c:508
 msgid "inch"
 msgstr "palec"
 
-#: ../src/print-gtk.c:453
+#: ../src/print-gtk.c:515
 msgid "mm"
 msgstr "mm"
 
-#: ../src/print-gtk.c:527
+#: ../src/print-gtk.c:589
 msgid "_Header Font:"
 msgstr "Pisava _glave:"
 
-#: ../src/print-gtk.c:530
+#: ../src/print-gtk.c:590
 msgid "B_ody Font:"
 msgstr "Pisava _telesa:"
 
-#: ../src/print-gtk.c:533
+#: ../src/print-gtk.c:591
 msgid "_Footer Font:"
 msgstr "Pisava _noge:"
 
-#: ../src/print-gtk.c:540
+#. syntax highlighting
+#. treatment of HTML messages and parts
+#: ../src/print-gtk.c:594 ../src/print-gtk.c:607
 msgid "Highlighting"
 msgstr "Poudarjanje"
 
-#: ../src/print-gtk.c:555
+#: ../src/print-gtk.c:597
 msgid "Highlight _cited text"
 msgstr "Poudari _navedeno besedilo"
 
-#: ../src/print-gtk.c:564
+#: ../src/print-gtk.c:601
 msgid "Highlight _structured phrases"
 msgstr "Poudari _oblikovana rekla"
 
-#: ../src/print-gtk.c:575
+#: ../src/print-gtk.c:613
+msgid "Download images from remote servers (may be dangerous)"
+msgstr ""
+
+#. margins
+#: ../src/print-gtk.c:624
 msgid "Margins"
 msgstr "Robovi"
 
-#: ../src/print-gtk.c:597
+#: ../src/print-gtk.c:628
 msgid "_Top"
 msgstr "_Zgoraj"
 
-#: ../src/print-gtk.c:603
+#: ../src/print-gtk.c:634
 msgid "_Bottom"
 msgstr "_Spodaj"
 
-#: ../src/print-gtk.c:615
+#: ../src/print-gtk.c:646
 msgid "_Left"
 msgstr "_Levo"
 
-#: ../src/print-gtk.c:621
+#: ../src/print-gtk.c:652
 msgid "_Right"
 msgstr "_Desno"
 
-#: ../src/print-gtk.c:747
+#: ../src/print-gtk.c:784
 #, c-format
 msgid "Error printing message: %s"
 msgstr "Napaka med tiskanjem sporočila: %s"
 
-#: ../src/save-restore.c:588
+#: ../src/save-restore.c:670
 msgid "Error during filters loading: "
 msgstr "Napaka med nalaganjem filtrov: "
 
-#: ../src/save-restore.c:590
+#: ../src/save-restore.c:672
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -6152,14 +6748,14 @@ msgstr ""
 "Napaka med nalaganjem filtrov: %s\n"
 "Filtri so lahko nepravilni."
 
-#: ../src/save-restore.c:712
+#: ../src/save-restore.c:791
 #, fuzzy
 #| msgid "The option not to recognize \"format=flowed\" text has been removed."
 msgid "The option not to recognize “format=flowed” text has been removed."
 msgstr ""
 "Možnost za neprepoznavanje besedila \"format=povezano\" je bila odstranjena."
 
-#: ../src/save-restore.c:989
+#: ../src/save-restore.c:1060
 #, fuzzy
 #| msgid ""
 #| "The option not to send \"format=flowed\" text is now on the Options menu "
@@ -6171,14 +6767,14 @@ msgstr ""
 "Možnost za ne-pošiljanje besedila \"format=povezano\" je sedaj zapisana v "
 "meniju možnosti sestavljalnega okna."
 
-#: ../src/save-restore.c:1028
+#: ../src/save-restore.c:1101
 msgid ""
 "The option to request a MDN is now on the Options menu of the compose window."
 msgstr ""
 "Možnost za zahtevo uporabe sporočila o prejemu je sedaj v meniju možnosti "
 "sestavljalnega okna."
 
-#: ../src/save-restore.c:1105
+#: ../src/save-restore.c:1176
 #, fuzzy
 #| msgid ""
 #| "This version of Balsa uses a new user interface; if you have changed "
@@ -6305,7 +6901,7 @@ msgstr "_Poljščina"
 #, fuzzy
 #| msgid "_Portugese"
 msgid "_Portuguese"
-msgstr "portugalska"
+msgstr "portugalski"
 
 #: ../src/sendmsg-window.c:211
 msgid "_Romanian"
@@ -6351,23 +6947,23 @@ msgstr "_Ukrajinščina"
 msgid "_Generic UTF-8"
 msgstr "_Splošni UTF-8"
 
-#: ../src/sendmsg-window.c:269
+#: ../src/sendmsg-window.c:265
 msgid "Attachment"
 msgstr "Priloga"
 
-#: ../src/sendmsg-window.c:269
+#: ../src/sendmsg-window.c:265
 msgid "Inline"
 msgstr "Medvrstično"
 
-#: ../src/sendmsg-window.c:269
+#: ../src/sendmsg-window.c:265
 msgid "Reference"
 msgstr "Sklic"
 
-#: ../src/sendmsg-window.c:517
+#: ../src/sendmsg-window.c:479
 msgid "(No name)"
 msgstr "(Brez imena)"
 
-#: ../src/sendmsg-window.c:523
+#: ../src/sendmsg-window.c:485
 #, fuzzy, c-format
 #| msgid ""
 #| "The message to '%s' is modified.\n"
@@ -6379,15 +6975,17 @@ msgstr ""
 "Sporočilo '%s' je bilo spremenjeno.\n"
 "Naj bo shranjeno v predal osnutkov?"
 
-#: ../src/sendmsg-window.c:818
-msgid "Gnome editor is not defined in your preferred applications."
+#: ../src/sendmsg-window.c:781
+#, fuzzy
+#| msgid "Gnome editor is not defined in your preferred applications."
+msgid "GNOME editor is not defined in your preferred applications."
 msgstr "Gnome urejevalnik ni določen med priljubljenimi programi."
 
-#: ../src/sendmsg-window.c:891
+#: ../src/sendmsg-window.c:854
 msgid "Select Identity"
 msgstr "Izbor istovetnosti"
 
-#: ../src/sendmsg-window.c:1406
+#: ../src/sendmsg-window.c:1363
 #, fuzzy, c-format
 #| msgid ""
 #| "Saying yes will not send the file `%s' itself, but just a MIME message/"
@@ -6408,18 +7006,18 @@ msgstr ""
 "\n"
 "Ali zares želite priložiti to datoteko kot sklic?"
 
-#: ../src/sendmsg-window.c:1419
+#: ../src/sendmsg-window.c:1376
 msgid "Attach as Reference?"
 msgstr "Priloži kot sklic?"
 
-#: ../src/sendmsg-window.c:1552
+#: ../src/sendmsg-window.c:1500
 #, fuzzy
 #| msgid "Choose charset"
 msgid "Choose character set"
 msgstr ""
 "Izbor nabora znakov, ki naj bo uporabljen med branjem oznak ID3v1 in ID3v2."
 
-#: ../src/sendmsg-window.c:1560
+#: ../src/sendmsg-window.c:1508
 #, fuzzy, c-format
 #| msgid ""
 #| "File\n"
@@ -6437,59 +7035,53 @@ msgstr ""
 "ni kodirana v naboru US-ASCII ali UTF-8.\n"
 "Izberite znakovni nabor za to datoteko."
 
-#: ../src/sendmsg-window.c:1580
+#: ../src/sendmsg-window.c:1528
 msgid "Attach as MIME type:"
 msgstr "Priloži kot vrsto MIME:"
 
-#: ../src/sendmsg-window.c:1641
+#: ../src/sendmsg-window.c:1589
 #, fuzzy, c-format
 #| msgid "Character set for file %s changed from \"%s\" to \"%s\"."
 msgid "Character set for file %s changed from “%s” to “%s”."
-msgstr "Pretvorba iz nabora '%s' v 'UTF-8' ni podprto"
+msgstr "Pretvorba iz nabora »%s« v »UTF-8« ni podprto"
 
-#: ../src/sendmsg-window.c:1684 ../src/sendmsg-window.c:5033
+#: ../src/sendmsg-window.c:1632 ../src/sendmsg-window.c:5123
 msgid "(no subject)"
 msgstr "(brez zadeve)"
 
-#: ../src/sendmsg-window.c:1722
+#: ../src/sendmsg-window.c:1669
 #, c-format
 msgid "Cannot create file URI object for %s"
 msgstr "Ni mogoče ustvariti predmeta URI datoteke za %s"
 
-#: ../src/sendmsg-window.c:1730
-msgid "unknown error"
-msgstr "neznana napaka"
-
-#: ../src/sendmsg-window.c:1770
+#: ../src/sendmsg-window.c:1717
 msgid "forwarded message"
 msgstr "posredovano sporočilo"
 
-#: ../src/sendmsg-window.c:1775
+#: ../src/sendmsg-window.c:1722
 #, fuzzy, c-format
 #| msgid "Message from %s, subject: \"%s\""
 msgid "Message from %s, subject: “%s”"
 msgstr "------ posredovano sporočilo od %s ------\n"
 
-#: ../src/sendmsg-window.c:1853 ../src/sendmsg-window.c:1926
+#: ../src/sendmsg-window.c:1806 ../src/sendmsg-window.c:1882
 msgid "Remove"
 msgstr "Odstrani"
 
-#: ../src/sendmsg-window.c:1938
-#, fuzzy
-#| msgid "_Open"
+#: ../src/sendmsg-window.c:1894
 msgid "Open…"
-msgstr "&Odpri"
+msgstr "Odpri …"
 
-#: ../src/sendmsg-window.c:1950
+#: ../src/sendmsg-window.c:1906
 msgid "(URL)"
 msgstr "(URL)"
 
-#: ../src/sendmsg-window.c:2006
+#: ../src/sendmsg-window.c:1962
 msgid "Attach file"
 msgstr "Priloži datoteko"
 
-#: ../src/sendmsg-window.c:2119 ../src/sendmsg-window.c:2222
-#: ../src/sendmsg-window.c:6857
+#: ../src/sendmsg-window.c:2074 ../src/sendmsg-window.c:2175
+#: ../src/sendmsg-window.c:7116
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -6497,151 +7089,171 @@ msgstr ""
 "Prilaganje sporočila ni uspelo.\n"
 "Mogoč vzrok: ni dovolj začasnega prostora"
 
-#: ../src/sendmsg-window.c:2441
+#: ../src/sendmsg-window.c:2389
 msgid "F_rom:"
 msgstr "O_d:"
 
 #. Subject:
-#: ../src/sendmsg-window.c:2591
+#: ../src/sendmsg-window.c:2539
 msgid "S_ubject:"
 msgstr "_Zadeva:"
 
-#: ../src/sendmsg-window.c:2618
+#: ../src/sendmsg-window.c:2570
 #, fuzzy
 msgid "F_CC:"
-msgstr "_Kp:"
+msgstr "Kp: "
 
 #. Attachment list
-#: ../src/sendmsg-window.c:2644
+#: ../src/sendmsg-window.c:2597
 msgid "_Attachments:"
 msgstr "_Priloge:"
 
-#: ../src/sendmsg-window.c:2688
+#: ../src/sendmsg-window.c:2641
 msgid "Mode"
 msgstr "Način"
 
-#: ../src/sendmsg-window.c:3034
+#: ../src/sendmsg-window.c:2664
+msgid "Description"
+msgstr "Opis"
+
+#: ../src/sendmsg-window.c:2987
 #, c-format
 msgid "Could not save attachment: %s"
 msgstr "Ni mogoče shraniti priloge: %s"
 
-#: ../src/sendmsg-window.c:3058
+#: ../src/sendmsg-window.c:3015
 msgid "No subject"
 msgstr "Brez zadeve"
 
-#: ../src/sendmsg-window.c:3092
+#: ../src/sendmsg-window.c:3064
+#, fuzzy
+#| msgid "encrypted: "
+msgid "decrypted: "
+msgstr "šifrirano:"
+
+#: ../src/sendmsg-window.c:3072
 #, fuzzy, c-format
 #| msgid "inlined file \"%s\" (%s)"
 msgid "inlined file “%s” (%s)"
 msgstr "medvrstični del %s"
 
-#: ../src/sendmsg-window.c:3095
+#: ../src/sendmsg-window.c:3075
 #, fuzzy, c-format
 #| msgid "attached file \"%s\" (%s)"
 msgid "attached file “%s” (%s)"
 msgstr "Napaka med nalaganjem priložene slike: %s\n"
 
-#: ../src/sendmsg-window.c:3099
+#: ../src/sendmsg-window.c:3080
 #, c-format
 msgid "inlined %s part"
 msgstr "medvrstični del %s"
 
-#: ../src/sendmsg-window.c:3101
+#: ../src/sendmsg-window.c:3082
 #, c-format
 msgid "attached %s part"
 msgstr "priložen del %s"
 
-#: ../src/sendmsg-window.c:3168
+#: ../src/sendmsg-window.c:3163
 #, fuzzy, c-format
 #| msgid "message from %s, subject \"%s\""
 msgid "message from %s, subject “%s”"
 msgstr "------ posredovano sporočilo od %s ------\n"
 
-#: ../src/sendmsg-window.c:3295
+#: ../src/sendmsg-window.c:3291
 msgid "quoted"
 msgstr "navedeno"
 
-#: ../src/sendmsg-window.c:3300 ../src/sendmsg-window.c:3303
+#: ../src/sendmsg-window.c:3296 ../src/sendmsg-window.c:3299
 msgid "quoted attachment"
 msgstr "navedena priloga"
 
-#: ../src/sendmsg-window.c:3329
+#: ../src/sendmsg-window.c:3343
 msgid "Select parts for quotation"
 msgstr "Izbor delov za navajanje"
 
-#: ../src/sendmsg-window.c:3340
+#: ../src/sendmsg-window.c:3355
 msgid "Select the parts of the message which shall be quoted in the reply"
 msgstr "Izberite dele sporočila, ki bodo navedeni v odgovoru"
 
-#: ../src/sendmsg-window.c:3493
+#: ../src/sendmsg-window.c:3378
+msgid ""
+"<b>Warning:</b> The original message contains an abnormal mixture of "
+"encrypted and unencrypted parts. This <i>might</i> indicate an attack.\n"
+"Double-check the contents of the reply before sending."
+msgstr ""
+
+#: ../src/sendmsg-window.c:3385 ../src/sendmsg-window.c:3457
+msgid ""
+"You reply to an encrypted message. The reply will contain the decrypted "
+"contents of the original message.\n"
+"Consider to encrypt the reply, and verify that you do not unintentionally "
+"leak sensitive information."
+msgstr ""
+
+#: ../src/sendmsg-window.c:3461
+msgid "Do not remind me again."
+msgstr ""
+
+#: ../src/sendmsg-window.c:3556
 msgid "you"
 msgstr "vi"
 
-#: ../src/sendmsg-window.c:3502
+#: ../src/sendmsg-window.c:3565
 #, c-format
 msgid "------forwarded message from %s------\n"
 msgstr "------ posredovano sporočilo od %s ------\n"
 
-#: ../src/sendmsg-window.c:3539
+#: ../src/sendmsg-window.c:3602
 #, c-format
 msgid "Message-ID: %s\n"
 msgstr "Id sporočila: %s\n"
 
-#: ../src/sendmsg-window.c:3545
+#: ../src/sendmsg-window.c:3608
 msgid "References:"
 msgstr "Sklici:"
 
-#: ../src/sendmsg-window.c:3556
+#: ../src/sendmsg-window.c:3619
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Dne, %s je %s napisal(a):\n"
 
-#: ../src/sendmsg-window.c:3558
+#: ../src/sendmsg-window.c:3621
 #, c-format
 msgid "%s wrote:\n"
 msgstr "%s je napisal(a):\n"
 
-#: ../src/sendmsg-window.c:3671
-msgid "No signature found!"
-msgstr "Ni mogoče najti podpisa!"
-
-#: ../src/sendmsg-window.c:3812
+#: ../src/sendmsg-window.c:3887
 msgid "Could not save message."
 msgstr "Ni mogoče shraniti sporočila."
 
-#: ../src/sendmsg-window.c:3819
+#: ../src/sendmsg-window.c:3894
 #, c-format
 msgid "Could not open draftbox: %s"
 msgstr "Ni mogoče odpreti predala osnutkov: %s"
 
-#: ../src/sendmsg-window.c:3844
+#: ../src/sendmsg-window.c:3923
 msgid "Message saved."
 msgstr "Sporočilo je shranjeno."
 
-#: ../src/sendmsg-window.c:4469 ../src/sendmsg-window.c:4477
-#: ../src/sendmsg-window.c:4484 ../src/sendmsg-window.c:4491
-#: ../src/sendmsg-window.c:4515
+#: ../src/sendmsg-window.c:4561 ../src/sendmsg-window.c:4569
+#: ../src/sendmsg-window.c:4576 ../src/sendmsg-window.c:4600
 #, c-format
 msgid "Could not attach the file %s: %s."
 msgstr "Ni mogoče priložiti datoteke %s: %s"
 
-#: ../src/sendmsg-window.c:4470
+#: ../src/sendmsg-window.c:4562
 msgid "not an absolute path"
 msgstr "ni absolutna pot"
 
-#: ../src/sendmsg-window.c:4478
-msgid "not in your directory"
-msgstr "ni v vaši mapi"
-
-#: ../src/sendmsg-window.c:4485
+#: ../src/sendmsg-window.c:4570
 msgid "does not exist"
 msgstr "ne obstaja"
 
-#: ../src/sendmsg-window.c:4516
+#: ../src/sendmsg-window.c:4601
 msgid "not in current directory"
 msgstr "ni v trenutni mapi"
 
-#: ../src/sendmsg-window.c:4566
+#: ../src/sendmsg-window.c:4653
 #, fuzzy
 #| msgid ""
 #| "The link that you selected created\n"
@@ -6659,47 +7271,59 @@ msgstr ""
 "Preverite, če je naslov\n"
 "primeren."
 
-#: ../src/sendmsg-window.c:4675
+#: ../src/sendmsg-window.c:4762
 #, fuzzy, c-format
 #| msgid "Could not write file %s: %s"
-msgid "Cannot not read the file “%s”: %s"
-msgstr "Datoteka PO '%s' ne obstaja ali pa je ni mogoče prebrati."
+msgid "Cannot read the file “%s”: %s"
+msgstr "Datoteka PO »%s« ne obstaja ali pa je ni mogoče prebrati."
 
-#: ../src/sendmsg-window.c:4694
+#: ../src/sendmsg-window.c:4781
 msgid "Include file"
 msgstr "Vključi datoteko"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4879
+#: ../src/sendmsg-window.c:4970
 #, c-format
 msgid "Could not load Face header file %s: %s"
 msgstr "Ni mogoče naložiti Face glave datoteke %s: %s"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:4882
+#: ../src/sendmsg-window.c:4973
 #, c-format
 msgid "Could not load X-Face header file %s: %s"
 msgstr "Ni mogoče naložiti X-Face glave datoteke %s: %s"
 
-#: ../src/sendmsg-window.c:4990
-#, fuzzy
-#| msgid "No subject"
+#: ../src/sendmsg-window.c:5083
 msgid "No Subject"
 msgstr "Brez zadeve"
 
-#: ../src/sendmsg-window.c:4995
+#: ../src/sendmsg-window.c:5088
 msgid "_Send"
 msgstr "_Pošlji"
 
-#: ../src/sendmsg-window.c:5016
+#: ../src/sendmsg-window.c:5109
 msgid "You did not specify a subject for this message"
 msgstr "Zadeve sporočila niste navedli"
 
-#: ../src/sendmsg-window.c:5017
+#: ../src/sendmsg-window.c:5110
 msgid "If you would like to provide one, enter it below."
 msgstr "Če jo želite navesti, jo vpišite spodaj."
 
-#: ../src/sendmsg-window.c:5110
+#: ../src/sendmsg-window.c:5168
+#, fuzzy
+#| msgid "Message could not be encrypted"
+msgid "Message could be encrypted"
+msgstr "Sporočila ni mogoče šifrirati"
+
+#: ../src/sendmsg-window.c:5171
+msgid "Send _encrypted"
+msgstr "Pošlji _šifrirano"
+
+#: ../src/sendmsg-window.c:5172
+msgid "Send _unencrypted"
+msgstr "Pošlji _nešifrirano"
+
+#: ../src/sendmsg-window.c:5242 ../src/sendmsg-window.c:5330
 #, c-format
 msgid ""
 "You did not select encryption for this message, although %s public keys are "
@@ -6709,19 +7333,43 @@ msgstr ""
 "Za to sporočilo ni izbranega šifriranja, čeprav so javni ključi %s na voljo "
 "vsem prejemnikom. Za zaščito svoje zasebnosti lahko sporočilo šifrirate s %s."
 
-#: ../src/sendmsg-window.c:5132
-msgid "Send _encrypted"
-msgstr "Pošlji _šifrirano"
+#: ../src/sendmsg-window.c:5317
+#, fuzzy, c-format
+#| msgid "Error loading Face: %s"
+msgid "error checking Autocrypt keys: %s"
+msgstr "Napaka med nalaganjem Face: %s"
 
-#: ../src/sendmsg-window.c:5147
-msgid "Send _unencrypted"
-msgstr "Pošlji _nešifrirano"
+#: ../src/sendmsg-window.c:5348
+msgid ""
+"\n"
+"However, encryption is discouraged as the Autocrypt status indicates that "
+"some recipients <i>might</i> not be able to read the message."
+msgstr ""
+
+#: ../src/sendmsg-window.c:5361
+#, c-format
+msgid ""
+"<i>Note:</i> choosing encryption will import %u key from the Autocrypt "
+"database into the GnuPG key ring."
+msgid_plural ""
+"<i>Note:</i> choosing encryption will import %u keys from the Autocrypt "
+"database into the GnuPG key ring."
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../src/sendmsg-window.c:5386
+#, fuzzy, c-format
+#| msgid "Cannot process the message: %s"
+msgid "Cannot import Autocrypt keys: %s"
+msgstr "Sporočila ni mogoče obdelati: %s"
 
-#: ../src/sendmsg-window.c:5207
+#: ../src/sendmsg-window.c:5446
 msgid "You selected OpenPGP security for this message.\n"
 msgstr "Za to sporočilo ste izbrali varnost OpenPGP.\n"
 
-#: ../src/sendmsg-window.c:5212
+#: ../src/sendmsg-window.c:5451
 msgid ""
 "The message text will be sent as plain text and as HTML, but only the plain "
 "part can be signed.\n"
@@ -6729,12 +7377,12 @@ msgstr ""
 "Besedilo sporočila bo poslano kot običajno besedilo in kot HTML, toda "
 "podpisan je lahko le običajni del.\n"
 
-#: ../src/sendmsg-window.c:5217
+#: ../src/sendmsg-window.c:5456
 msgid ""
 "The message contains attachments, which cannot be signed or encrypted.\n"
 msgstr "Sporočilo vsebuje priloge, ki jih ni mogoče podpisati ali šifrirati.\n"
 
-#: ../src/sendmsg-window.c:5221
+#: ../src/sendmsg-window.c:5460
 msgid ""
 "You should select MIME mode if the complete message shall be protected. Do "
 "you really want to proceed?"
@@ -6742,37 +7390,37 @@ msgstr ""
 "V primeru, da želite zaščititi celotno sporočilo morate izbrati način MIME. "
 "Ali resnično želite nadaljevati?"
 
-#: ../src/sendmsg-window.c:5246
+#: ../src/sendmsg-window.c:5483
 #, fuzzy, c-format
 #| msgid "sending message with gpg mode %d"
 msgid "sending message with GPG mode %d"
 msgstr "Pošiljanje sporočila %d od %d"
 
-#: ../src/sendmsg-window.c:5274
+#: ../src/sendmsg-window.c:5513
 msgid "Message could not be created"
 msgstr "Sporočila ni mogoče ustvariti"
 
-#: ../src/sendmsg-window.c:5276
+#: ../src/sendmsg-window.c:5515
 msgid "Message could not be queued in outbox"
 msgstr "Sporočila ni mogoče dati v vrsto v odhodni predal"
 
-#: ../src/sendmsg-window.c:5278
+#: ../src/sendmsg-window.c:5517
 msgid "Message could not be saved in sentbox"
 msgstr "Sporočila ni mogoče shraniti v poslano pošto"
 
-#: ../src/sendmsg-window.c:5280
+#: ../src/sendmsg-window.c:5519
 msgid "Message could not be sent"
 msgstr "Sporočila ni mogoče poslati"
 
-#: ../src/sendmsg-window.c:5283
+#: ../src/sendmsg-window.c:5521
 msgid "Message could not be signed"
 msgstr "Sporočila ni mogoče podpisati"
 
-#: ../src/sendmsg-window.c:5285
+#: ../src/sendmsg-window.c:5523
 msgid "Message could not be encrypted"
 msgstr "Sporočila ni mogoče šifrirati"
 
-#: ../src/sendmsg-window.c:5291
+#: ../src/sendmsg-window.c:5528
 #, c-format
 msgid ""
 "Send failed: %s\n"
@@ -6781,116 +7429,112 @@ msgstr ""
 "Pošiljanje je spodletelo: %s\n"
 "%s"
 
-#: ../src/sendmsg-window.c:5296
+#: ../src/sendmsg-window.c:5534
 #, c-format
 msgid "Send failed: %s"
 msgstr "Pošiljanje je spodletelo: %s"
 
-#: ../src/sendmsg-window.c:5395
+#: ../src/sendmsg-window.c:5633
 #, c-format
 msgid "Could not postpone message: %s"
 msgstr "Ni mogoče odložiti pošiljanja sporočila: %s"
 
-#: ../src/sendmsg-window.c:5416
+#: ../src/sendmsg-window.c:5654
 msgid "Message postponed."
 msgstr "Pošiljanje sporočila je bilo odloženo."
 
-#: ../src/sendmsg-window.c:5421
+#: ../src/sendmsg-window.c:5659
 msgid "Could not postpone message."
 msgstr "Pošiljanja sporočila ni mogoče odložiti."
 
-#: ../src/sendmsg-window.c:5633
+#: ../src/sendmsg-window.c:5871
 #, c-format
 msgid "Error starting spell checker: %s"
 msgstr "Napaka med zagonom črkovalnika: %s"
 
-#: ../src/sendmsg-window.c:6382
+#: ../src/sendmsg-window.c:6634
 #, c-format
 msgid "Reply to %s: %s"
 msgstr "Odgovori osebi %s: %s"
 
-#: ../src/sendmsg-window.c:6387
+#: ../src/sendmsg-window.c:6639
 #, c-format
 msgid "Forward message to %s: %s"
 msgstr "Posreduj sporočilo osebi %s: %s"
 
-#: ../src/sendmsg-window.c:6391
+#: ../src/sendmsg-window.c:6643
 #, c-format
 msgid "New message to %s: %s"
 msgstr "Novo sporočilo za %s: %s"
 
-#: ../src/sendmsg-window.c:6556
+#: ../src/sendmsg-window.c:6807 ../ui/sendmsg-window.ui.h:33
 msgid "_Language"
 msgstr "_Jezik"
 
-#: ../src/spell-check.c:211
+#: ../src/spell-check.c:224
 msgid "Spell check"
 msgstr "Preverjanje črkovanja"
 
-#: ../src/spell-check.c:339
+#: ../src/spell-check.c:352
 msgid "C_hange"
 msgstr "S_premeni"
 
-#: ../src/spell-check.c:341
+#: ../src/spell-check.c:354
 msgid "Replace the current word with the selected suggestion"
 msgstr "Zamenja trenutno besedilo z izbranim predlogom"
 
-#: ../src/spell-check.c:347
+#: ../src/spell-check.c:360
 msgid "Change _All"
 msgstr "Spremeni _vse"
 
-#: ../src/spell-check.c:349
+#: ../src/spell-check.c:362
 msgid ""
 "Replace all occurrences of the current word with the selected suggestion"
 msgstr "Zamenja vse pojavitve trenutne besede z izbranim predlogom"
 
-#: ../src/spell-check.c:355
+#: ../src/spell-check.c:368
 msgid "_Ignore"
 msgstr "_Prezri"
 
-#: ../src/spell-check.c:357
+#: ../src/spell-check.c:370
 msgid "Skip the current word"
 msgstr "Preskoči trenutno besedo"
 
-#: ../src/spell-check.c:362
-#, fuzzy
-#| msgid "Ignore A_ll"
+#: ../src/spell-check.c:375
 msgid "I_gnore All"
-msgstr "_Prezri napake potrdila SSL"
+msgstr "_Prezri vse"
 
-#: ../src/spell-check.c:364
+#: ../src/spell-check.c:377
 msgid "Skip all occurrences of the current word"
 msgstr "Preskoči vse pojavitve trenutne besede"
 
-#: ../src/spell-check.c:369
+#: ../src/spell-check.c:382
 msgid "_Learn"
 msgstr "_Nauči se"
 
-#: ../src/spell-check.c:371
+#: ../src/spell-check.c:384
 msgid "Add the current word to your personal dictionary"
 msgstr "Doda trenutno besedo v osebni slovarček"
 
-#: ../src/spell-check.c:376
+#: ../src/spell-check.c:389
 msgid "_Done"
 msgstr "_Končano"
 
-#: ../src/spell-check.c:377
+#: ../src/spell-check.c:390
 msgid "Finish spell checking"
 msgstr "Konča preverjanje črkovanja"
 
-#: ../src/spell-check.c:384
+#: ../src/spell-check.c:397
 msgid "Revert all changes and finish spell checking"
 msgstr "Povrni vse spremembe in končaj preverjanje črkovanja"
 
-#: ../src/spell-check.c:1018
+#: ../src/spell-check.c:1024
 #, fuzzy, c-format
 #| msgid "BalsaSpellCheck: Pspell Error: %s\n"
 msgid "BalsaSpellCheck: Enchant Error: %s\n"
-msgstr ""
-"Pot: »%s«\n"
-"Napaka: %s"
+msgstr "napaka: %s\n"
 
-#: ../src/store-address.c:104
+#: ../src/store-address.c:105
 msgid "Store address: no addresses"
 msgstr "Shrani naslov: ni naslovov"
 
@@ -6902,7 +7546,7 @@ msgstr "Shrani naslov"
 #, fuzzy
 #| msgid "No address book selected...."
 msgid "No address book selected…"
-msgstr "Izbriše izbrani imenik"
+msgstr "Pokaže lastnosti izbranega imenika"
 
 #: ../src/store-address.c:259
 msgid "Address could not be written to this address book."
@@ -6921,56 +7565,50 @@ msgid "Unexpected address book error. Report it."
 msgstr "Nepričakovana napaka v imeniku. Pošljite poročilo."
 
 #: ../src/store-address.c:290
-#, fuzzy
-#| msgid "Address Book"
 msgid "Address Book:"
-msgstr "_Imenik"
+msgstr "Imenik:"
 
-#: ../src/store-address.c:336
-#, fuzzy
-#| msgid "From:"
+#: ../src/store-address.c:339
 msgid "From: "
-msgstr "_Od:"
+msgstr "Od: "
 
-#: ../src/store-address.c:337
+#: ../src/store-address.c:340
 msgid "To: "
 msgstr "Za:"
 
-#: ../src/store-address.c:338
-#, fuzzy
+#: ../src/store-address.c:341
 msgid "CC: "
-msgstr "_Kp:"
+msgstr "Kp: "
 
-#: ../src/store-address.c:339
-#, fuzzy
+#: ../src/store-address.c:342
 msgid "BCC: "
-msgstr "_Skp:"
+msgstr "Skp: "
 
-#: ../src/toolbar-factory.c:140
+#: ../src/toolbar-factory.c:115
 msgid "Separator"
 msgstr "Ločnica"
 
-#: ../src/toolbar-factory.c:141
+#: ../src/toolbar-factory.c:116
 msgid "Quit"
 msgstr "Končaj"
 
-#: ../src/toolbar-factory.c:142
+#: ../src/toolbar-factory.c:117
 msgid "Check"
 msgstr "Preveri"
 
-#: ../src/toolbar-factory.c:143
+#: ../src/toolbar-factory.c:118
 msgid "Compose"
 msgstr "Sestavi"
 
-#: ../src/toolbar-factory.c:144
+#: ../src/toolbar-factory.c:119
 msgid "Continue"
 msgstr "Nadaljuj"
 
-#: ../src/toolbar-factory.c:145
+#: ../src/toolbar-factory.c:120
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../src/toolbar-factory.c:146
+#: ../src/toolbar-factory.c:121
 msgid ""
 "Reply\n"
 "to all"
@@ -6978,7 +7616,7 @@ msgstr ""
 "Odgovori\n"
 "vsem"
 
-#: ../src/toolbar-factory.c:147
+#: ../src/toolbar-factory.c:122
 msgid ""
 "Reply\n"
 "to group"
@@ -6986,11 +7624,11 @@ msgstr ""
 "Odgovori\n"
 "skupini"
 
-#: ../src/toolbar-factory.c:148
+#: ../src/toolbar-factory.c:123
 msgid "Forward"
 msgstr "Posreduj"
 
-#: ../src/toolbar-factory.c:151
+#: ../src/toolbar-factory.c:126
 msgid ""
 "Next\n"
 "unread"
@@ -6998,7 +7636,7 @@ msgstr ""
 "Naslednje\n"
 "neprebrano"
 
-#: ../src/toolbar-factory.c:152
+#: ../src/toolbar-factory.c:127
 msgid ""
 "Next\n"
 "flagged"
@@ -7006,246 +7644,1075 @@ msgstr ""
 "Naslednje\n"
 "z zastavico"
 
-#: ../src/toolbar-factory.c:153
-msgid ""
-"Previous\n"
-"part"
-msgstr ""
-"Predhodni\n"
-"del"
+#: ../src/toolbar-factory.c:128
+msgid ""
+"Previous\n"
+"part"
+msgstr ""
+"Predhodni\n"
+"del"
+
+#: ../src/toolbar-factory.c:129
+msgid ""
+"Next\n"
+"part"
+msgstr ""
+"Naslednji\n"
+"del"
+
+#: ../src/toolbar-factory.c:130
+msgid ""
+"Trash /\n"
+"Delete"
+msgstr ""
+"Smeti /\n"
+"Izbriši"
+
+#: ../src/toolbar-factory.c:131 ../ui/sendmsg-window.ui.h:8
+msgid "Postpone"
+msgstr "Odloži"
+
+#: ../src/toolbar-factory.c:132
+msgid "Print"
+msgstr "Natisni"
+
+#: ../src/toolbar-factory.c:133
+msgid ""
+"Request\n"
+"MDN"
+msgstr ""
+"Zahtevaj\n"
+"sporočilo o prejemu"
+
+#: ../src/toolbar-factory.c:134 ../ui/sendmsg-window.ui.h:6
+msgid "Send"
+msgstr "Pošlji"
+
+#: ../src/toolbar-factory.c:135
+#, fuzzy
+#| msgid "_Send Queued Mail"
+msgid "Send queued"
+msgstr "Pošlje čakajočo pošto in prejme novo"
+
+#: ../src/toolbar-factory.c:136
+msgid "Exchange"
+msgstr "Exchange"
+
+#: ../src/toolbar-factory.c:137 ../src/toolbar-factory.c:167
+#: ../ui/sendmsg-window.ui.h:7
+msgid "Queue"
+msgstr "Daj v vrsto"
+
+#: ../src/toolbar-factory.c:138
+msgid "Attach"
+msgstr "Priloži"
+
+#: ../src/toolbar-factory.c:139
+msgid "Save"
+msgstr "Shrani"
+
+#: ../src/toolbar-factory.c:140
+msgid "Identity"
+msgstr "Istovetnost"
+
+#: ../src/toolbar-factory.c:143
+msgid ""
+"Toggle\n"
+"new"
+msgstr ""
+"Preklopi\n"
+"novo"
+
+#: ../src/toolbar-factory.c:144
+msgid "Mark all"
+msgstr "Označi vse"
+
+#: ../src/toolbar-factory.c:145
+msgid ""
+"All\n"
+"headers"
+msgstr ""
+"Vse\n"
+"glave"
+
+#: ../src/toolbar-factory.c:146
+#, fuzzy
+#| msgid "Check cryptographic signature"
+msgid ""
+"Recheck\n"
+"cryptography"
+msgstr "Preveri šifrirni podpis"
+
+#: ../src/toolbar-factory.c:147
+msgid ""
+"Reset\n"
+"Filter"
+msgstr ""
+"Ponastavi\n"
+"filter"
+
+#: ../src/toolbar-factory.c:148
+#, fuzzy
+#| msgid "Msg Preview"
+msgid "Message Preview"
+msgstr "Označi navedeno besedilo v »predogledu« sporočila"
+
+#: ../src/toolbar-factory.c:149
+msgid "Sign"
+msgstr "Podpiši"
+
+#: ../src/toolbar-factory.c:150
+msgid "Encrypt"
+msgstr "Šifriraj"
+
+#: ../src/toolbar-factory.c:151 ../ui/sendmsg-window.ui.h:14
+msgid "Undo"
+msgstr "Razveljavi"
+
+#: ../src/toolbar-factory.c:152 ../ui/sendmsg-window.ui.h:15
+msgid "Redo"
+msgstr "Ponovi"
+
+#: ../src/toolbar-factory.c:153
+msgid "Expunge"
+msgstr "Uniči"
+
+#: ../src/toolbar-factory.c:154
+msgid ""
+"Empty\n"
+"Trash"
+msgstr ""
+"Izprazni\n"
+"smeti"
+
+#: ../src/toolbar-factory.c:450
+msgid "Queue this message for sending"
+msgstr "Premakni sporočilo v vrsto za pošiljanje"
+
+#: ../src/toolbar-factory.c:462
+msgid "Text Be_low Icons"
+msgstr "Besedilo _pod ikonami"
+
+#: ../src/toolbar-factory.c:463
+msgid "Priority Text Be_side Icons"
+msgstr "Prednostno besedilo _ob ikonah"
+
+#: ../src/toolbar-factory.c:465
+msgid "_Icons Only"
+msgstr "Le _ikone"
+
+#: ../src/toolbar-factory.c:466
+msgid "_Text Only"
+msgstr "_Le besedilo"
+
+#: ../src/toolbar-factory.c:688
+#, c-format
+msgid "Use Desktop _Default (%s)"
+msgstr "Uporabi _privzeto namizje (%s)"
+
+#: ../src/toolbar-factory.c:714
+#, fuzzy
+#| msgid "Customize Toolbars"
+msgid "_Customize Toolbars…"
+msgstr "Prilagodi orodne vrstice"
+
+#: ../src/toolbar-prefs.c:126
+msgid "Customize Toolbars"
+msgstr "Prilagodi orodne vrstice"
+
+#: ../src/toolbar-prefs.c:167
+msgid "Compose window"
+msgstr "Sestavljalno okno"
+
+#: ../src/toolbar-prefs.c:178
+msgid "Toolbar options"
+msgstr "Možnosti orodne vrstice"
+
+#: ../src/toolbar-prefs.c:187
+msgid "_Wrap button labels"
+msgstr "_Prelomi oznake gumbov"
+
+#: ../src/toolbar-prefs.c:357
+#, c-format
+msgid "Error displaying toolbar help: %s\n"
+msgstr "Napaka med prikazovanjem pomoči orodne vrstice: %s\n"
+
+#. Preview display
+#: ../src/toolbar-prefs.c:393
+msgid "Preview"
+msgstr "Predogled"
+
+#: ../src/toolbar-prefs.c:423
+msgid "_Restore toolbar to standard buttons"
+msgstr "_Obnovi orodno vrstico na običajne gumbe"
+
+#. Style button
+#: ../src/toolbar-prefs.c:427
+msgid "Toolbar _style…"
+msgstr "_Slog orodne vrstice …"
+
+#: ../src/toolbar-prefs.c:444
+msgid "Available buttons"
+msgstr "Razpoložljivi gumbi"
+
+#: ../src/toolbar-prefs.c:460
+msgid "Current toolbar"
+msgstr "Trenutna orodna vrstica"
+
+#: ../src/toolbar-prefs.c:481
+#, fuzzy
+#| msgid "Cut the selected text"
+msgid "Move selected item up"
+msgstr "Premakne izbrani predmet na orodni vrstici"
+
+#: ../src/toolbar-prefs.c:491
+#, fuzzy
+#| msgid "Save selected to folder..."
+msgid "Remove selected item from toolbar"
+msgstr "Odstrani izbrani predmet iz orodne vrstice"
+
+#: ../src/toolbar-prefs.c:499
+#, fuzzy
+msgid "Add selected item to toolbar"
+msgstr "Odstrani izbrani predmet iz orodne vrstice"
+
+#: ../src/toolbar-prefs.c:506
+#, fuzzy
+#| msgid "Save selected to folder..."
+msgid "Move selected item down"
+msgstr "Premakni trenutno vrstico nižje"
+
+#: ../ui/ab-main.ui.h:1 ../ui/main-window.ui.h:1 ../ui/message-window.ui.h:1
+#: ../ui/sendmsg-window.ui.h:1 ../ui/source-viewer.ui.h:1
+msgid "_File"
+msgstr "_Datoteka"
+
+#. Translators: main menu item - New address book
+#: ../ui/ab-main.ui.h:3
+msgctxt "address book"
+msgid "_New"
+msgstr "_Nov"
+
+#: ../ui/ab-main.ui.h:4
+msgid "_VCard Address Book (GnomeCard)"
+msgstr "Imenik VCard GnomeVizitka"
+
+#: ../ui/ab-main.ui.h:5
+msgid "_External query (a program)"
+msgstr "_Zunanja poizvedba (program)"
+
+#: ../ui/ab-main.ui.h:6
+msgid "_LDIF Address Book"
+msgstr "Imenik _LDIF"
+
+#: ../ui/ab-main.ui.h:7
+msgid "_LDAP Address Book"
+msgstr "Imenik _LDAP"
+
+#: ../ui/ab-main.ui.h:8
+msgid "_GPE Address Book"
+msgstr "Imenik _GPE"
+
+#: ../ui/ab-main.ui.h:9
+msgid "_Rubrica Address Book"
+msgstr "Imenik _Rubrica"
+
+#: ../ui/ab-main.ui.h:10 ../ui/main-window.ui.h:60
+msgid "_Properties"
+msgstr "_Lastnosti"
+
+#: ../ui/ab-main.ui.h:12 ../ui/main-window.ui.h:18
+msgid "_Quit"
+msgstr "_Končaj"
+
+#: ../ui/ab-main.ui.h:13
+msgid "_Entry"
+msgstr "_Vnos"
+
+#: ../ui/ab-main.ui.h:14
+msgid "_New Entry"
+msgstr "_Nov vnos"
+
+#: ../ui/ab-main.ui.h:15
+msgid "_Delete Entry"
+msgstr "_Izbriši vnos"
+
+#: ../ui/ab-main.ui.h:17
+msgid "_About"
+msgstr "_O programu"
+
+#. Translators: window menu item - New message or mailbox
+#: ../ui/main-window.ui.h:3
+#, fuzzy
+#| msgid "_New"
+msgctxt "window menu"
+msgid "_New"
+msgstr "_Novo"
+
+#: ../ui/main-window.ui.h:4
+#, fuzzy
+#| msgid "Local _mbox mailbox..."
+msgid "Local mbox mailbox…"
+msgstr "Predal ni v obliki mbox."
+
+#: ../ui/main-window.ui.h:5
+#, fuzzy
+#| msgid "Local Mail_dir mailbox..."
+msgid "Local Maildir mailbox…"
+msgstr "Nov krajevni poštni predal %s"
+
+#: ../ui/main-window.ui.h:6
+#, fuzzy
+#| msgid "Local M_H mailbox..."
+msgid "Local MH mailbox…"
+msgstr "%H%M"
+
+#: ../ui/main-window.ui.h:8
+#, fuzzy
+#| msgid "Remote IMAP subfolder"
+msgid "Remote IMAP subfolder…"
+msgstr "Oddaljena podmapa IMAP"
+
+#: ../ui/main-window.ui.h:9
+msgid "_Continue"
+msgstr "N_adaljuj"
+
+#: ../ui/main-window.ui.h:10
+msgid "_Get New Mail"
+msgstr "_Dobi novo pošto"
+
+#: ../ui/main-window.ui.h:11
+#, fuzzy
+#| msgid "_Send Queued Mail"
+msgid "_Send Queued Mail"
+msgstr "Pošlje čakajočo pošto in prejme novo"
+
+#: ../ui/main-window.ui.h:12
+msgid "Send and _Receive Mail"
+msgstr "Pošlji in p_rejmi pošto"
+
+#: ../ui/main-window.ui.h:13 ../ui/message-window.ui.h:2
+msgid "Page _Setup"
+msgstr "Nastavitev _strani"
+
+#: ../ui/main-window.ui.h:14 ../ui/message-window.ui.h:3
+#: ../ui/sendmsg-window.ui.h:11
+msgid "_Print…"
+msgstr "_Natisni …"
+
+#: ../ui/main-window.ui.h:15
+msgid "_Address Book"
+msgstr "_Imenik"
+
+#: ../ui/main-window.ui.h:16
+msgid "A_utocrypt Database"
+msgstr ""
+
+#: ../ui/main-window.ui.h:17
+msgid "Empty _Trash"
+msgstr "Izprazni _Smeti"
+
+#: ../ui/main-window.ui.h:20 ../ui/message-window.ui.h:6
+#: ../ui/sendmsg-window.ui.h:17 ../ui/source-viewer.ui.h:4
+msgid "_Copy"
+msgstr "_Kopiraj"
+
+#: ../ui/main-window.ui.h:22
+msgid "Select _Thread"
+msgstr "Izberi _nit"
+
+#: ../ui/main-window.ui.h:23
+msgid "_Find"
+msgstr "_Poišči"
+
+#: ../ui/main-window.ui.h:24
+msgid "Find Ne_xt"
+msgstr "Poišči _naslednje"
+
+#: ../ui/main-window.ui.h:25 ../ui/message-window.ui.h:8
+msgid "Find in _Message"
+msgstr "_Najdi v sporočilu"
+
+#: ../ui/main-window.ui.h:26
+msgid "F_ilters…"
+msgstr "F_iltri …"
+
+#: ../ui/main-window.ui.h:27
+msgid "_Export Filters…"
+msgstr "_Izvozi filtre …"
+
+#: ../ui/main-window.ui.h:28
+msgid "_Preferences"
+msgstr "Mož_nosti"
+
+#: ../ui/main-window.ui.h:29
+msgid "_Settings…"
+msgstr "_Nastavitve …"
+
+#: ../ui/main-window.ui.h:30
+msgid "_Toolbars…"
+msgstr "_Orodne vrstice …"
+
+#: ../ui/main-window.ui.h:31
+msgid "_Identities…"
+msgstr "_Istovetnosti …"
+
+#: ../ui/main-window.ui.h:32 ../ui/message-window.ui.h:9
+#: ../ui/source-viewer.ui.h:6
+msgid "_View"
+msgstr "_Pogled"
+
+#: ../ui/main-window.ui.h:33
+msgid "_Show Mailbox Tree"
+msgstr "_Pokaži drevo poštnih predalov"
+
+#: ../ui/main-window.ui.h:34
+msgid "Show Mailbox _Tabs"
+msgstr "Pokaži z_avihke poštnih predalov"
+
+#: ../ui/main-window.ui.h:35 ../ui/message-window.ui.h:10
+#: ../ui/sendmsg-window.ui.h:28
+msgid "Show Too_lbar"
+msgstr "Pokaži o_rodno vrstico"
+
+#: ../ui/main-window.ui.h:36
+msgid "Show St_atus Bar"
+msgstr "Pokaži vrstico s_tanja"
+
+#: ../ui/main-window.ui.h:37
+msgid "Show _Index Filter"
+msgstr "Pokaži filter _kazala"
+
+#: ../ui/main-window.ui.h:38 ../ui/message-window.ui.h:11
+msgid "_Wrap"
+msgstr "_Prelomi"
+
+#: ../ui/main-window.ui.h:39 ../ui/message-window.ui.h:12
+msgid "_No Headers"
+msgstr "_Brez glav"
+
+#: ../ui/main-window.ui.h:40 ../ui/message-window.ui.h:13
+msgid "S_elected Headers"
+msgstr "_Izbrane glave"
+
+#: ../ui/main-window.ui.h:41 ../ui/message-window.ui.h:14
+msgid "All _Headers"
+msgstr "_Vse glave"
+
+#: ../ui/main-window.ui.h:42
+#, fuzzy
+#| msgid "H_ide messages"
+msgid "Th_read messages"
+msgstr "S_krij sporočila"
+
+#: ../ui/main-window.ui.h:43
+msgid "E_xpand All"
+msgstr "_Razširi vse"
+
+#: ../ui/main-window.ui.h:44
+msgid "_Collapse All"
+msgstr "_Zloži vse"
+
+#: ../ui/main-window.ui.h:45 ../ui/message-window.ui.h:15
+msgid "Zoom _In"
+msgstr "_Približaj"
+
+#: ../ui/main-window.ui.h:46 ../ui/message-window.ui.h:16
+msgid "Zoom _Out"
+msgstr "_Oddalji"
+
+#: ../ui/main-window.ui.h:48 ../ui/message-window.ui.h:18
+#, no-c-format
+msgid "Zoom _100%"
+msgstr "_Približaj na 100 %"
+
+#: ../ui/main-window.ui.h:49
+msgid "Mail_box"
+msgstr "Poš_tni predal"
+
+#: ../ui/main-window.ui.h:50
+msgid "_Hide Messages"
+msgstr "_Skrij sporočila"
+
+#: ../ui/main-window.ui.h:51
+msgid "_Deleted"
+msgstr "_Izbrisano"
+
+#: ../ui/main-window.ui.h:52
+#, fuzzy
+#| msgid "Un_Deleted"
+msgid "Un_deleted"
+msgstr "_Povrnjeno"
+
+#: ../ui/main-window.ui.h:53
+msgid "_Read"
+msgstr "P_rebrano"
+
+#: ../ui/main-window.ui.h:54
+msgid "Un_read"
+msgstr "N_eprebrano"
+
+#: ../ui/main-window.ui.h:56
+msgid "Un_flagged"
+msgstr "_Brez zastavic"
+
+#: ../ui/main-window.ui.h:57
+msgid "_Answered"
+msgstr "_Odgovorjeno"
+
+#: ../ui/main-window.ui.h:58
+msgid "Un_answered"
+msgstr "_Neodgovorjeno"
+
+#: ../ui/main-window.ui.h:59
+msgid "_Reset Filter"
+msgstr "_Ponastavi filter"
+
+#: ../ui/main-window.ui.h:62
+msgid "Select _Filters…"
+msgstr "Izbor _filtrov …"
+
+#: ../ui/main-window.ui.h:63
+msgid "_Remove Duplicates"
+msgstr "_Odstrani dvojnike"
+
+#: ../ui/main-window.ui.h:64
+msgid "E_xpunge Deleted Messages"
+msgstr "_Uniči izbrisana sporočila "
+
+#: ../ui/main-window.ui.h:66 ../ui/message-window.ui.h:20
+msgid "_Message"
+msgstr "_Sporočilo"
+
+#: ../ui/main-window.ui.h:67
+msgid "_New…"
+msgstr "_Novo …"
+
+#: ../ui/main-window.ui.h:69 ../ui/message-window.ui.h:22
+msgid "Reply to _All…"
+msgstr "Odgovori _vsem …"
+
+#: ../ui/main-window.ui.h:70 ../ui/message-window.ui.h:23
+msgid "Reply to _Group…"
+msgstr "Odgovori _skupini …"
+
+#: ../ui/main-window.ui.h:74 ../ui/message-window.ui.h:26
+msgid "_Next Part"
+msgstr "_Naslednji del"
+
+#: ../ui/main-window.ui.h:75 ../ui/message-window.ui.h:27
+msgid "_Previous Part"
+msgstr "_Predhodni del"
+
+#: ../ui/main-window.ui.h:76 ../ui/message-window.ui.h:28
+#, fuzzy
+#| msgid "Save Current Part..."
+msgid "Save Current Part…"
+msgstr "Shrani trenutni del ..."
+
+#: ../ui/main-window.ui.h:77 ../ui/message-window.ui.h:29
+#, fuzzy
+#| msgid "_View Source"
+msgid "_View Source…"
+msgstr "_Ogled izvorne kode"
+
+#: ../ui/main-window.ui.h:78 ../ui/message-window.ui.h:30
+#, fuzzy
+#| msgid ""
+#| "_Decrypt and check\n"
+#| "signatures automatically:"
+msgid "Decrypt and check signatures"
+msgstr ""
+"_Dešifriraj in samodejno\n"
+"preveri podpise:"
+
+#: ../ui/main-window.ui.h:79 ../ui/source-viewer.ui.h:5
+msgid "_Select Text"
+msgstr "_Izberi besedilo"
+
+#: ../ui/main-window.ui.h:80 ../ui/message-window.ui.h:35
+msgid "_Move to Trash"
+msgstr "_Prestavi v Smeti"
+
+#: ../ui/main-window.ui.h:81
+msgid "_Toggle Flag"
+msgstr "_Preklopi zastavico"
+
+#: ../ui/main-window.ui.h:82
+msgid "_New"
+msgstr "_Novo"
+
+#: ../ui/main-window.ui.h:84
+#, fuzzy
+#| msgid "_No"
+msgid "_Go"
+msgstr "_Ne"
+
+#: ../ui/main-window.ui.h:85 ../ui/message-window.ui.h:31
+msgid "Next Message"
+msgstr "Naslednje sporočilo"
+
+#: ../ui/main-window.ui.h:86 ../ui/message-window.ui.h:32
+msgid "Previous Message"
+msgstr "Predhodno sporočilo"
+
+#: ../ui/main-window.ui.h:87 ../ui/message-window.ui.h:33
+msgid "Next Unread Message"
+msgstr "Naslednje neprebrano sporočilo"
+
+#: ../ui/main-window.ui.h:88 ../ui/message-window.ui.h:34
+msgid "Next Flagged Message"
+msgstr "Naslednje sporočilo z zastavico"
+
+#: ../ui/main-window.ui.h:90
+msgid "_Contents"
+msgstr "_Vsebina"
+
+#: ../ui/main-window.ui.h:91
+msgid "_About Balsa"
+msgstr "_O programu"
+
+#: ../ui/sendmsg-window.ui.h:2
+msgid "_Include File…"
+msgstr "_Vključi datoteko …"
+
+#: ../ui/sendmsg-window.ui.h:3
+msgid "_Attach File…"
+msgstr "_Priloži datoteko …"
+
+#: ../ui/sendmsg-window.ui.h:4
+msgid "I_nclude Messages…"
+msgstr "_Vključi sporočila …"
+
+#: ../ui/sendmsg-window.ui.h:5
+msgid "Attach _Messages…"
+msgstr "Priloži _sporočila …"
+
+#: ../ui/sendmsg-window.ui.h:9
+msgid "_Save"
+msgstr "_Shrani"
+
+#: ../ui/sendmsg-window.ui.h:10
+msgid "Page S_etup"
+msgstr "Nastavitev _strani"
+
+#: ../ui/sendmsg-window.ui.h:16
+msgid "Cu_t"
+msgstr "I_zreži"
+
+#: ../ui/sendmsg-window.ui.h:18
+msgid "_Paste"
+msgstr "_Prilepi"
+
+#: ../ui/sendmsg-window.ui.h:20
+msgid "_Wrap Body"
+msgstr "_Prelomi besedilo sporočila"
+
+#: ../ui/sendmsg-window.ui.h:21
+msgid "_Reflow Selected Text"
+msgstr "_Poveži izbrano besedilo"
+
+#: ../ui/sendmsg-window.ui.h:22
+msgid "Insert Si_gnature"
+msgstr "Vstavi po_dpis"
+
+#: ../ui/sendmsg-window.ui.h:23
+msgid "_Quote Message(s)"
+msgstr "_Navedi sporočilo"
+
+#: ../ui/sendmsg-window.ui.h:24
+msgid "C_heck Spelling"
+msgstr "_Preveri črkovanje"
+
+#: ../ui/sendmsg-window.ui.h:25
+msgid "Select _Identity…"
+msgstr "Izbor _istovetnosti …"
+
+#: ../ui/sendmsg-window.ui.h:26
+msgid "Edit with GNOME-Editor"
+msgstr "Uredi z urejevalnikom GNOME"
+
+#: ../ui/sendmsg-window.ui.h:27
+msgid "_Show"
+msgstr "_Pokaži"
+
+#: ../ui/sendmsg-window.ui.h:29
+msgid "F_rom"
+msgstr "O_d"
+
+#: ../ui/sendmsg-window.ui.h:30
+msgid "Rec_ipients"
+msgstr "_Prejemniki"
+
+#: ../ui/sendmsg-window.ui.h:31
+msgid "R_eply To"
+msgstr "_Odgovori"
+
+#: ../ui/sendmsg-window.ui.h:32
+msgid "F_cc"
+msgstr "M_Kp"
+
+#: ../ui/sendmsg-window.ui.h:34
+msgid "_Options"
+msgstr "_Možnosti"
+
+#: ../ui/sendmsg-window.ui.h:35
+msgid "_Request Disposition Notification"
+msgstr "_Zahtevaj obvestilo o prejetju"
+
+#: ../ui/sendmsg-window.ui.h:36
+msgid "_Request Delivery Status Notification"
+msgstr "_Zahtevaj obvestilo o prejetju sporočila"
+
+#: ../ui/sendmsg-window.ui.h:37
+msgid "_Format = Flowed"
+msgstr "_Oblika = Povezana"
+
+#: ../ui/sendmsg-window.ui.h:38
+msgid "Send as plain text and _HTML"
+msgstr "Pošlji kot običajno besedilo in _HTML"
+
+#: ../ui/sendmsg-window.ui.h:39
+msgid "_Sign Message"
+msgstr "_Podpiši sporočilo"
+
+#: ../ui/sendmsg-window.ui.h:40
+msgid "_Encrypt Message"
+msgstr "_Šifriraj sporočilo"
+
+#: ../ui/sendmsg-window.ui.h:41
+msgid "GnuPG uses _MIME mode"
+msgstr "GnuPG z uporabo načina _MIME"
+
+#: ../ui/sendmsg-window.ui.h:42
+msgid "GnuPG uses old _OpenPGP mode"
+msgstr "GnuPG z uporabo načina _OpenPGP"
+
+#: ../ui/sendmsg-window.ui.h:43
+msgid "S/MIME mode (_GpgSM)"
+msgstr "Način S/MIME (_GpgSM)"
+
+#: ../ui/sendmsg-window.ui.h:44
+msgid "Attach GnuPG _Public Key"
+msgstr ""
+
+#: ../ui/source-viewer.ui.h:7
+msgid "_Escape Special Characters"
+msgstr "_Izpusti posebne znake"
+
+#~ msgid "SASL Interaction\n"
+#~ msgstr "Delovanje SASL\n"
+
+#, fuzzy
+#~| msgid ""
+#~| "Signing and encrypting messages are possible\n"
+#~| "only if Balsa is built with cryptographic support."
+#~ msgid ""
+#~ "Signing and encrypting messages are possible only if Balsa is built with "
+#~ "cryptographic support."
+#~ msgstr ""
+#~ "Podpisovanje in šifriranje sporočil je mogoče le v primeru,\n"
+#~ "da je Balsa izgrajena s podporo za šifriranje."
+
+#, fuzzy
+#~ msgid "Falling back\n"
+#~ msgstr ""
+#~ "Urejevalnik Dconf omogoča urejanje katerekoli nastavitve, ki jo podpira "
+#~ "okolje GSettings, se pa nastavitev povrne na vpisano vrednost, če ni "
+#~ "drugače navedeno. Navedeno je urejen 32-bitni seznam."
+
+#~ msgid "Invalid date"
+#~ msgstr "Neveljaven datum"
+
+#~ msgid ""
+#~ "Authenticity of this certificate could not be verified.\n"
+#~ "<b>Reason:</b> %s\n"
+#~ "<b>This certificate belongs to:</b>\n"
+#~ msgstr ""
+#~ "Pristnosti uporabljenega potrdila ni mogoče preveriti.\n"
+#~ "<b>Vzrok:</b> %s\n"
+#~ "<b>To potrdilo pripada:</b>\n"
+
+#~ msgid "Connection to %s timed out. Abort?"
+#~ msgstr "Povezava z %s je zakasnela. Ali naj bo preklicana?"
+
+#~ msgid "Key ID"
+#~ msgstr "ID Ključa"
+
+#~ msgid "Length"
+#~ msgstr "Dolžina"
+
+#~ msgid "Validity"
+#~ msgstr "Veljavnost"
+
+#~ msgid "libbalsa_mailbox_get_message: mailbox %s is closed"
+#~ msgstr "libbalsa_mailbox_get_message: poštni predal %s je zaprt"
+
+#~ msgid "%s: Opening %s Refcount: %d\n"
+#~ msgstr "%s: Odpiranje %s, Števec sklicev: %d\n"
+
+#~ msgid ""
+#~ "IMAP SEARCH command failed for mailbox %s\n"
+#~ "falling back to default searching method"
+#~ msgstr ""
+#~ "Ukaz IMAP SEARCH je za poštni predal %s spodletel\n"
+#~ "vrnjeno na privzet način iskanja"
+
+#~ msgid "Cache file for mailbox %s will be created"
+#~ msgstr "Za poštni predal %s bo ustvarjena predpomnilniška datoteka"
+
+#~ msgid "Connected"
+#~ msgstr "Povezano"
+
+#~ msgid "completed"
+#~ msgstr "končano"
+
+#~ msgid "in process"
+#~ msgstr "v obdelavi"
+
+#~ msgid "S/MIME signature: "
+#~ msgstr "Podpis S/MIME: "
+
+#~ msgid "(unknown protocol) "
+#~ msgstr "(neznan protokol)"
+
+#~ msgid ""
+#~ "\n"
+#~ "Key owner trust: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Zaupanje lastniku ključa: %s"
+
+#, fuzzy
+#~| msgid ""
+#~| "\n"
+#~| "User ID's:"
+#~ msgid ""
+#~ "\n"
+#~ "User IDs:"
+#~ msgstr "Seznam id-jev podpredmetov"
+
+#~ msgid ""
+#~ "\n"
+#~ "User ID:"
+#~ msgstr ""
+#~ "\n"
+#~ "ID uporabnika:"
+
+#~ msgid " [Revoked]"
+#~ msgstr "[Preklicano]"
+
+#~ msgid " [Invalid]"
+#~ msgstr "[Neveljavno]"
+
+#~ msgid ""
+#~ "\n"
+#~ "Subkey created on: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Podključ je bil ustvarjen ob: %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "Subkey expires on: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Podključ poteče ob: %s"
+
+#~ msgid " revoked"
+#~ msgstr " preklicano"
 
-#: ../src/toolbar-factory.c:154
-msgid ""
-"Next\n"
-"part"
-msgstr ""
-"Naslednji\n"
-"del"
+#~ msgid " expired"
+#~ msgstr " pretečeno"
 
-#: ../src/toolbar-factory.c:155
-msgid ""
-"Trash /\n"
-"Delete"
-msgstr ""
-"Smeti /\n"
-"Izbriši"
+#~ msgid " disabled"
+#~ msgstr " onemogočeno"
 
-#: ../src/toolbar-factory.c:156
-msgid "Postpone"
-msgstr "Odloži"
+#~ msgid " invalid"
+#~ msgstr " neveljavno"
 
-#: ../src/toolbar-factory.c:157
-msgid "Print"
-msgstr "Natisni"
+#~ msgid ""
+#~ "\n"
+#~ "Subkey attribute:%s"
+#~ msgid_plural ""
+#~ "\n"
+#~ "Subkey attributes:%s"
+#~ msgstr[0] ""
+#~ "\n"
+#~ "Atributi podključa:%s"
+#~ msgstr[1] ""
+#~ "\n"
+#~ "Atributi podključa:%s"
+#~ msgstr[2] ""
+#~ "\n"
+#~ "Atributi podključa:%s"
+#~ msgstr[3] ""
+#~ "\n"
+#~ "Atributi podključa:%s"
 
-#: ../src/toolbar-factory.c:158
-msgid ""
-"Request\n"
-"MDN"
-msgstr ""
-"Zahtevaj\n"
-"sporočilo o prejemu"
+#~ msgid ""
+#~ "\n"
+#~ "Issuer name: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Ime izdajatelja: %s"
 
-#: ../src/toolbar-factory.c:159
-msgid "Send"
-msgstr "Pošlji"
+#~ msgid ""
+#~ "\n"
+#~ "Issuer serial number: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Zaporedna številka izdajatelja: %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "Chain ID: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "ID verige: %s"
 
-#: ../src/toolbar-factory.c:160
 #, fuzzy
-#| msgid "_Send Queued Mail"
-msgid "Send queued"
-msgstr "Pošlje čakajočo pošto in prejme novo"
+#~| msgid "Reading embedded message failed: %s"
+#~ msgid "Sending queued messages to %s"
+#~ msgstr "Napaka med pošiljanjem podatkov: %s"
 
-#: ../src/toolbar-factory.c:161
-msgid "Exchange"
-msgstr "Exchange"
+#~ msgid "This message will not be encrypted for the BCC: recipient(s)."
+#~ msgstr "Sporočilo ne bo šifrirano za prejemnike SKP:."
 
-#: ../src/toolbar-factory.c:162 ../src/toolbar-factory.c:194
-msgid "Queue"
-msgstr "Daj v vrsto"
+#~ msgid "Logging in to %s using %s"
+#~ msgstr "Prijavljanje v %s z %s"
 
-#: ../src/toolbar-factory.c:163
-msgid "Attach"
-msgstr "Priloži"
+#, fuzzy
+#~ msgid "_Client Certificate:"
+#~ msgstr "Potrdilo odjemalca X.509"
 
-#: ../src/toolbar-factory.c:164
-msgid "Save"
-msgstr "Shrani"
+#~ msgid "_Host Name"
+#~ msgstr "_Ime gostitelja"
 
-#: ../src/toolbar-factory.c:165
-msgid "Identity"
-msgstr "Istovetnost"
+#~ msgid "_Remember password in keyring"
+#~ msgstr "_Zapomni si geslo v zbirki ključev"
 
-#: ../src/toolbar-factory.c:168
-msgid ""
-"Toggle\n"
-"new"
-msgstr ""
-"Preklopi\n"
-"novo"
+#~ msgid ""
+#~ "Opening remote mailbox %s.\n"
+#~ "The _password for %s@%s:"
+#~ msgstr ""
+#~ "Odpiranje oddaljenega poštnega predala %s.\n"
+#~ "_Geslo za %s@%s:"
 
-#: ../src/toolbar-factory.c:169
-msgid "Mark all"
-msgstr "Označi vse"
+#~ msgid "Failed to find mailbox"
+#~ msgstr "Ni mogoče najti poštnega predala"
 
-#: ../src/toolbar-factory.c:170
-msgid ""
-"All\n"
-"headers"
-msgstr ""
-"Vse\n"
-"glave"
+#~ msgid "Detected a good signature"
+#~ msgstr "Zaznan je dober podpis"
 
-#: ../src/toolbar-factory.c:171
-msgid ""
-"Reset\n"
-"Filter"
-msgstr ""
-"Ponastavi\n"
-"filter"
+#~ msgid "Summary"
+#~ msgstr "Povzetek"
 
-#: ../src/toolbar-factory.c:172
-#, fuzzy
-#| msgid "Msg Preview"
-msgid "Message Preview"
-msgstr "Pokaži _predogled sporočila"
+#~ msgid "Organizer"
+#~ msgstr "Organizator"
 
-#: ../src/toolbar-factory.c:174
-msgid "Sign"
-msgstr "Podpiši"
+#~ msgid "Start"
+#~ msgstr "Začetek"
 
-#: ../src/toolbar-factory.c:175
-msgid "Encrypt"
-msgstr "Šifriraj"
+#~ msgid "End"
+#~ msgstr "Konec"
 
-#: ../src/toolbar-factory.c:177
-msgid "Undo"
-msgstr "Razveljavi"
+#~ msgid "Location"
+#~ msgstr "Mesto"
 
-#: ../src/toolbar-factory.c:178
-msgid "Redo"
-msgstr "Ponovi"
+#~ msgid "Attendees"
+#~ msgstr "Udeleženci"
 
-#: ../src/toolbar-factory.c:179
-msgid "Expunge"
-msgstr "Uniči"
+#~ msgid "Attendee"
+#~ msgstr "Udeleženec"
 
-#: ../src/toolbar-factory.c:180
-msgid ""
-"Empty\n"
-"Trash"
-msgstr ""
-"Izprazni\n"
-"smeti"
+#~ msgid "Descriptive _name:"
+#~ msgstr "Opisno _ime:"
 
-#: ../src/toolbar-factory.c:181
-msgid "Edit"
-msgstr "Uredi"
+#~ msgid "Use_r name:"
+#~ msgstr "Upo_rabniško ime:"
 
-#: ../src/toolbar-factory.c:407
-#, fuzzy, c-format
-#| msgid "Unknown toolbar icon \"%s\""
-msgid "Unknown toolbar icon “%s”"
-msgstr "Uporabi en_ako oznako za ikono v orodni vrstici"
+#~ msgid "_Anonymous access"
+#~ msgstr "_Anonimni dostop"
 
-#: ../src/toolbar-factory.c:484
-msgid "Queue this message for sending"
-msgstr "Premakni sporočilo v vrsto za pošiljanje"
+#~ msgid "Required"
+#~ msgstr "Zahtevano"
 
-#: ../src/toolbar-factory.c:496
-msgid "Text Be_low Icons"
-msgstr "Besedilo _pod ikonami"
+#~ msgid "Use _SSL"
+#~ msgstr "Uporabi _SSL"
 
-#: ../src/toolbar-factory.c:497
-msgid "Priority Text Be_side Icons"
-msgstr "Prednostno besedilo _ob ikonah"
+#~ msgid "Use _TLS:"
+#~ msgstr "Uporabi _TLS:"
 
-#: ../src/toolbar-factory.c:499
-msgid "_Icons Only"
-msgstr "Le _ikone"
+#~ msgid "Mailbox _name:"
+#~ msgstr "_Ime poštnega predala:"
 
-#: ../src/toolbar-factory.c:500
-msgid "_Text Only"
-msgstr "_Le besedilo"
+#, fuzzy
+#~ msgid "POP3 over SSL (POP3S)"
+#~ msgstr "POP3 preko SSL"
 
-#: ../src/toolbar-factory.c:764
-#, c-format
-msgid "Use Desktop _Default (%s)"
-msgstr "Uporabi _privzeto namizje (%s)"
+#~ msgid "Pass_word:"
+#~ msgstr "_Geslo:"
+
+#~ msgid "_Username:"
+#~ msgstr "_Uporabniško ime:"
+
+#~ msgid "F_older path:"
+#~ msgstr "_Pot mape:"
 
-#: ../src/toolbar-factory.c:790
 #, fuzzy
-#| msgid "Customize Toolbars"
-msgid "_Customize Toolbars…"
-msgstr "Prilagodi orodne vrstice"
+#~| msgid "Remote _IMAP mailbox..."
+#~ msgid "Remote _IMAP mailbox…"
+#~ msgstr "Za mapo »%s« ni ustreznega poštnega nabiralnika IMAP"
 
-#: ../src/toolbar-prefs.c:136
-msgid "Customize Toolbars"
-msgstr "Prilagodi orodne vrstice"
+#~ msgid "_Subscribe"
+#~ msgstr "_Naroči se"
 
-#: ../src/toolbar-prefs.c:181
-msgid "Compose window"
-msgstr "Sestavljalno okno"
+#~ msgid "Local mailbox %s loaded as: %s\n"
+#~ msgstr "Krajevni poštni predal %s je bil naložen kot: %s\n"
 
-#: ../src/toolbar-prefs.c:194
-msgid "Toolbar options"
-msgstr "Možnosti orodne vrstice"
+#~ msgid "Local folder %s\n"
+#~ msgstr "Krajevna mapa %s\n"
 
-#: ../src/toolbar-prefs.c:203
-msgid "_Wrap button labels"
-msgstr "_Prelomi oznake gumbov"
+#~ msgid "Debug IMAP connection"
+#~ msgstr "Razhroščevanje povezave IMAP"
 
-#: ../src/toolbar-prefs.c:386
-#, c-format
-msgid "Error displaying toolbar help: %s\n"
-msgstr "Napaka med prikazovanjem pomoči orodne vrstice: %s\n"
+#~ msgid "Show help options"
+#~ msgstr "Pokaži možnosti pomoči"
 
-#. Preview display
-#: ../src/toolbar-prefs.c:422
-msgid "Preview"
-msgstr "Predogled"
+#~ msgid "Finished Checking."
+#~ msgstr "Preverjanje je končano."
 
-#: ../src/toolbar-prefs.c:452
-msgid "_Restore toolbar to standard buttons"
-msgstr "_Obnovi orodno vrstico na običajne gumbe"
+#~ msgid "Balsa: New mail"
+#~ msgstr "Balsa: nova pošta"
 
-#. Style button
-#: ../src/toolbar-prefs.c:456
 #, fuzzy
-#| msgid "Toolbar _style..."
-msgid "Toolbar _style…"
-msgstr "Slog orodne vrstice"
+#~| msgid "Remote IMAP mailbox..."
+#~ msgid "Remote IMAP mailbox…"
+#~ msgstr "Za mapo »%s« ni ustreznega poštnega nabiralnika IMAP"
 
-#: ../src/toolbar-prefs.c:473
-msgid "Available buttons"
-msgstr "Razpoložljivi gumbi"
+#~ msgid "Default threading style:"
+#~ msgstr "Privzet slog nitenja:"
 
-#: ../src/toolbar-prefs.c:489
-msgid "Current toolbar"
-msgstr "Trenutna orodna vrstica"
+#~ msgid "Debug"
+#~ msgstr "Razhroščevanje"
 
-#: ../src/toolbar-prefs.c:510
-#, fuzzy
-#| msgid "Cut the selected text"
-msgid "Move selected item up"
-msgstr "Premakne izbrani predmet na orodni vrstici"
+#~ msgid "Signed matter"
+#~ msgstr "Podpisana zadeva"
 
-#: ../src/toolbar-prefs.c:520
-#, fuzzy
-#| msgid "Save selected to folder..."
-msgid "Remove selected item from toolbar"
-msgstr "Odstrani izbrani predmet iz orodne vrstice"
+#~ msgid "Encrypted matter"
+#~ msgstr "Šifrirana zadeva"
 
-#: ../src/toolbar-prefs.c:528
-#, fuzzy
-msgid "Add selected item to toolbar"
-msgstr "Odstrani izbrani predmet iz orodne vrstice"
+#~ msgid "This is an inline %s signed %s message part:"
+#~ msgstr "Medvrstični %s podpisani %s del besedila:"
+
+#~ msgid "not in your directory"
+#~ msgstr "ni v vaši mapi"
 
-#: ../src/toolbar-prefs.c:535
 #, fuzzy
-#| msgid "Save selected to folder..."
-msgid "Move selected item down"
-msgstr "Pomakni trenutno masko nižje"
+#~| msgid "Unknown toolbar icon \"%s\""
+#~ msgid "Unknown toolbar icon “%s”"
+#~ msgstr "Velikost ikon orodne vrstice"
 
 #~ msgid "Bcc:"
 #~ msgstr "Skp:"
@@ -7393,30 +8860,15 @@ msgstr "Pomakni trenutno masko nižje"
 #~ "Težava strežnika SMTP (%d): %s\n"
 #~ "Sporočilo je ostalo v odhodnem predalu."
 
-#~ msgid "_File"
-#~ msgstr "_Datoteka"
-
-#~ msgid "_View"
-#~ msgstr "_Pogled"
-
 #~ msgid "Close the window"
 #~ msgstr "Zapri okno"
 
-#~ msgid "_Copy"
-#~ msgstr "_Kopiraj"
-
 #~ msgid "Copy text"
 #~ msgstr "Kopira besedilo"
 
-#~ msgid "_Select Text"
-#~ msgstr "_Izberi besedilo"
-
 #~ msgid "Select entire mail"
 #~ msgstr "Izbere celotno pošto"
 
-#~ msgid "_Escape Special Characters"
-#~ msgstr "_Izpusti posebne znake"
-
 #~ msgid "Escape special and non-ASCII characters"
 #~ msgstr "Izpusti posebne in ne-ASCII znake"
 
@@ -7427,39 +8879,21 @@ msgstr "Pomakni trenutno masko nižje"
 #~ "Prišlo je do težav med ustvarjanjem poštnih predalov\n"
 #~ "%s"
 
-#~ msgid "_Entry"
-#~ msgstr "_Vnos"
-
-#~ msgid "Rubrica Address Book"
-#~ msgstr "Imenik Rubrica"
-
 #~ msgid "Edit address book properties"
 #~ msgstr "Uredi lastnosti imenika"
 
 #~ msgid "Delete address book"
 #~ msgstr "Izbriše imenik"
 
-#~ msgid "_Quit"
-#~ msgstr "_Končaj"
-
 #~ msgid "Exit the program"
 #~ msgstr "Izhod iz programa"
 
-#~ msgid "_New Entry"
-#~ msgstr "_Nov vnos"
-
 #~ msgid "Add new entry"
 #~ msgstr "Doda nov vnos"
 
-#~ msgid "_Delete Entry"
-#~ msgstr "_Izbriši vnos"
-
 #~ msgid "Delete entry"
 #~ msgstr "Izbris vnosa"
 
-#~ msgid "_About"
-#~ msgstr "_O programu"
-
 #~ msgid "E-Mail Address"
 #~ msgstr "Naslov elektronske pošte"
 
@@ -7550,18 +8984,6 @@ msgstr "Pomakni trenutno masko nižje"
 #~ "Run '%s --help' to see a full list of available command line options.\n"
 #~ msgstr "Za popoln seznam možnosti ukazne vrstice zaženite '%s --help'.\n"
 
-#~ msgid "Mail_box"
-#~ msgstr "Poš_tni predal"
-
-#~ msgid "_Message"
-#~ msgstr "_Sporočilo"
-
-#~ msgid "_Settings"
-#~ msgstr "_Nastavitve"
-
-#~ msgid "Mail_boxes"
-#~ msgstr "Poš_tni predali"
-
 #~ msgid "_More"
 #~ msgstr "_Več"
 
@@ -7571,42 +8993,24 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "_Sort Mailbox"
 #~ msgstr "_Razvrsti poštni predal"
 
-#~ msgid "H_ide messages"
-#~ msgstr "S_krij sporočila"
-
 #~ msgid "_Tools"
 #~ msgstr "_Orodja"
 
-#~ msgid "F_ilters"
-#~ msgstr "F_iltri"
-
 #~ msgid "Manage filters"
 #~ msgstr "Upravljanje filtrov"
 
-#~ msgid "_Continue"
-#~ msgstr "N_adaljuj"
-
 #~ msgid "Continue editing current message"
 #~ msgstr "Nadaljuje z urejanjem trenutnega sporočila"
 
-#~ msgid "_Get New Mail"
-#~ msgstr "_Dobi novo pošto"
-
 #~ msgid "Fetch new incoming mail"
 #~ msgstr "Pridobi novo prispelo pošto"
 
 #~ msgid "Send messages from the outbox"
 #~ msgstr "Pošlje sporočila iz odhodnega predala"
 
-#~ msgid "Send and _Receive Mail"
-#~ msgstr "Pošlji in p_rejmi pošto"
-
 #~ msgid "Send and Receive messages"
 #~ msgstr "Pošlje in prejme sporočila"
 
-#~ msgid "Page _Setup"
-#~ msgstr "Nastavitev _strani"
-
 #~ msgid "Set up page for printing"
 #~ msgstr "Nastavi stran za tiskanje"
 
@@ -7673,18 +9077,9 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "Export filters as Sieve scripts"
 #~ msgstr "Izvozi filtre kot skripte Sieve"
 
-#~ msgid "Prefere_nces"
-#~ msgstr "Mož_nosti"
-
-#~ msgid "E_xpand All"
-#~ msgstr "_Razširi vse"
-
 #~ msgid "Expand all threads"
 #~ msgstr "Razširi vse niti"
 
-#~ msgid "_Collapse All"
-#~ msgstr "_Zloži vse"
-
 #~ msgid "Collapse all expanded threads"
 #~ msgstr "Zloži vse razširjene niti"
 
@@ -7697,12 +9092,6 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "No magnification"
 #~ msgstr "Brez povečave"
 
-#~ msgid "Next Unread Message"
-#~ msgstr "Naslednje neprebrano sporočilo"
-
-#~ msgid "Empty _Trash"
-#~ msgstr "Izprazni _Smeti"
-
 #~ msgid "Delete messages from the Trash mailbox"
 #~ msgstr "Izbriše sporočila iz poštnega predala Smeti"
 
@@ -7712,39 +9101,12 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "Customize toolbars"
 #~ msgstr "Prilagodi orodne vrstice"
 
-#~ msgid "_Identities..."
-#~ msgstr "_Istovetnosti ..."
-
 #~ msgid "Create and set current identities"
 #~ msgstr "Ustvari in nastavi trenutne istovetnosti"
 
-#~ msgid "_Contents"
-#~ msgstr "_Vsebina"
-
 #~ msgid "Table of Contents"
 #~ msgstr "Kazalo vsebine"
 
-#~ msgid "_Find"
-#~ msgstr "_Poišči"
-
-#~ msgid "Find Ne_xt"
-#~ msgstr "Poišči _naslednje"
-
-#~ msgid "Next Message"
-#~ msgstr "Naslednje sporočilo"
-
-#~ msgid "Previous Message"
-#~ msgstr "Predhodno sporočilo"
-
-#~ msgid "Next Flagged Message"
-#~ msgstr "Naslednje sporočilo z zastavico"
-
-#~ msgid "_Hide Messages"
-#~ msgstr "_Skrij sporočila"
-
-#~ msgid "_Reset Filter"
-#~ msgstr "_Ponastavi filter"
-
 #~ msgid "Reset mailbox filter"
 #~ msgstr "Ponastavi filter poštnega predala"
 
@@ -7760,25 +9122,16 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "Delete the selected mailbox"
 #~ msgstr "Izbriše izbran poštni predal"
 
-#~ msgid "E_xpunge Deleted Messages"
-#~ msgstr "_Uniči izbrisana sporočila "
-
 #~ msgid "Expunge messages marked as deleted in the current mailbox"
 #~ msgstr "Uniči sporočila označena kot izbrisana v trenutnem poštnem predalu"
 
 #~ msgid "Close mailbox"
 #~ msgstr "Zapri poštni predal"
 
-#~ msgid "Select _Filters"
-#~ msgstr "Izberi _filtre"
-
 #~ msgid "Select filters to be applied automatically to current mailbox"
 #~ msgstr ""
 #~ "Izberite filtre za samodejno uveljavitev v trenutnem poštnem predalu"
 
-#~ msgid "_Remove Duplicates"
-#~ msgstr "_Odstrani dvojnike"
-
 #~ msgid "Reply to the current message"
 #~ msgstr "Odgovori na trenutno sporočilo"
 
@@ -7824,9 +9177,6 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "Pipe the message through another program"
 #~ msgstr "Pošlji sporočilo preko drugega programa"
 
-#~ msgid "Select _Thread"
-#~ msgstr "Izberi _nit"
-
 #~ msgid "Select all messages in current thread"
 #~ msgstr "Izbere vsa sporočila v trenutni niti"
 
@@ -7836,36 +9186,21 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "Print current message"
 #~ msgstr "Natisne trenutno sporočilo"
 
-#~ msgid "Save Current Part..."
-#~ msgstr "Shrani trenutni del ..."
-
 #~ msgid "Save currently displayed part of message"
 #~ msgstr "Shrani trenutno prikazan del sporočila"
 
-#~ msgid "_Next Part"
-#~ msgstr "_Naslednji del"
-
 #~ msgid "Next part in message"
 #~ msgstr "Naslednji del sporočila"
 
-#~ msgid "_Previous Part"
-#~ msgstr "_Predhodni del"
-
 #~ msgid "Previous part in message"
 #~ msgstr "Predhodni del sporočila"
 
 #~ msgid "Copy message"
 #~ msgstr "Kopiraj sporočilo"
 
-#~ msgid "Find in _Message"
-#~ msgstr "_Najdi v sporočilu"
-
 #~ msgid "Find a string in this message"
 #~ msgstr "Najdi niz v tem sporočilu"
 
-#~ msgid "_Move to Trash"
-#~ msgstr "_Prestavi v Smeti"
-
 #~ msgid "Move the current message to Trash mailbox"
 #~ msgstr "Premakne trenutno sporočilo v poštni predal Smeti"
 
@@ -7875,45 +9210,21 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "Toggle New"
 #~ msgstr "Preklopi novo"
 
-#~ msgid "_Toggle Flag"
-#~ msgstr "_Preklopi zastavico"
-
 #~ msgid "Toggle flagged"
 #~ msgstr "Preklopi zastavico"
 
-#~ msgid "_Deleted"
-#~ msgstr "_Izbrisano"
-
 #~ msgid "Toggle deleted flag"
 #~ msgstr "Preklopi zastavice izbrisanih sporočil"
 
-#~ msgid "_Answered"
-#~ msgstr "_Odgovorjeno"
-
 #~ msgid "Toggle Answered"
 #~ msgstr "Preklopi odgovorjeno"
 
-#~ msgid "_Show Mailbox Tree"
-#~ msgstr "_Pokaži drevo poštnih predalov"
-
 #~ msgid "Toggle display of mailbox and folder tree"
 #~ msgstr "Preklopi prikaz poštnega predala in drevesa map"
 
-#~ msgid "Show Mailbox _Tabs"
-#~ msgstr "Pokaži z_avihke poštnih predalov"
-
 #~ msgid "Toggle display of mailbox notebook tabs"
 #~ msgstr "Preklopi prikaz zavihkov beležke poštnega predala"
 
-#~ msgid "Show Too_lbar"
-#~ msgstr "Pokaži o_rodno vrstico"
-
-#~ msgid "Show St_atus Bar"
-#~ msgstr "Pokaži vrstico s_tanja"
-
-#~ msgid "Show _Index Filter"
-#~ msgstr "Pokaži filter _kazala"
-
 #~ msgid "_Descending"
 #~ msgstr "_Padajoče"
 
@@ -7926,48 +9237,21 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "Enable quick message index filter"
 #~ msgstr "Omogoči hiter filter kazala sporočila"
 
-#~ msgid "_Wrap"
-#~ msgstr "_Prelomi"
-
 #~ msgid "Wrap message lines"
 #~ msgstr "Prelomi vrstice sporočila"
 
-#~ msgid "Un_Deleted"
-#~ msgstr "_Povrnjeno"
-
-#~ msgid "_Read"
-#~ msgstr "P_rebrano"
-
-#~ msgid "Un_read"
-#~ msgstr "N_eprebrano"
-
-#~ msgid "Un_flagged"
-#~ msgstr "_Brez zastavic"
-
-#~ msgid "Un_answered"
-#~ msgstr "_Neodgovorjeno"
-
 #~ msgid "Show all headers"
 #~ msgstr "Pokaže vse glave"
 
 #~ msgid "Show preview pane"
 #~ msgstr "Pokaži pladenj predogleda"
 
-#~ msgid "_No Headers"
-#~ msgstr "_Brez glav"
-
 #~ msgid "Display no headers"
 #~ msgstr "Ne pokaži glav"
 
-#~ msgid "S_elected Headers"
-#~ msgstr "_Izbrane glave"
-
 #~ msgid "Display selected headers"
 #~ msgstr "Pokaže izbrane glave"
 
-#~ msgid "All _Headers"
-#~ msgstr "_Vse glave"
-
 #~ msgid "Display all headers"
 #~ msgstr "Pokaže vse glave"
 
@@ -8089,33 +9373,15 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "Error setting GConf field: %s\n"
 #~ msgstr "Napaka med nastavljanjem polja GConf: %s\n"
 
-#~ msgid "_Show"
-#~ msgstr "_Pokaži"
-
-#~ msgid "_Options"
-#~ msgstr "_Možnosti"
-
-#~ msgid "_Include File..."
-#~ msgstr "_Vključi datoteko ..."
-
 #~ msgid "Include a file"
 #~ msgstr "Vključi datoteko"
 
-#~ msgid "_Attach File..."
-#~ msgstr "_Priloži datoteko ..."
-
 #~ msgid "Attach a file"
 #~ msgstr "Priloži datoteko"
 
-#~ msgid "I_nclude Message(s)"
-#~ msgstr "_Vključi sporočila"
-
 #~ msgid "Include selected message(s)"
 #~ msgstr "Vključi izbrana sporočila"
 
-#~ msgid "Attach _Message(s)"
-#~ msgstr "Priloži _sporočila"
-
 #~ msgid "Attach selected message(s)"
 #~ msgstr "Priloži izbrana sporočila"
 
@@ -8137,33 +9403,12 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "Redo most recent change"
 #~ msgstr "Uveljavi zadnjo spremembo"
 
-#~ msgid "Cu_t"
-#~ msgstr "I_zreži"
-
 #~ msgid "Copy to the clipboard"
 #~ msgstr "Kopira v odložišče"
 
-#~ msgid "_Paste"
-#~ msgstr "_Prilepi"
-
 #~ msgid "Paste from the clipboard"
 #~ msgstr "Prilepi iz odložišča"
 
-#~ msgid "_Wrap Body"
-#~ msgstr "_Prelomi besedilo sporočila"
-
-#~ msgid "_Reflow Selected Text"
-#~ msgstr "_Poveži izbrano besedilo"
-
-#~ msgid "Insert Si_gnature"
-#~ msgstr "Vstavi po_dpis"
-
-#~ msgid "_Quote Message(s)"
-#~ msgstr "_Navedi sporočilo"
-
-#~ msgid "C_heck Spelling"
-#~ msgstr "_Preveri črkovanje"
-
 #~ msgid "Check the spelling of the message"
 #~ msgstr "Preveri črkovanje sporočila"
 
@@ -8173,9 +9418,6 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "Select the Identity to use for the message"
 #~ msgstr "Izbere istovetnost, ki bo uporabljena za sporočilo"
 
-#~ msgid "_Edit with Gnome-Editor"
-#~ msgstr "_Uredi z urejevalnikom Gnome"
-
 #~ msgid "Edit the current message with the default Gnome editor"
 #~ msgstr "Urejanje trenutnega sporočila s privzetim urejevalnikom Gnome"
 
@@ -8203,45 +9445,15 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "Too_lbar"
 #~ msgstr "O_rodna vrstica"
 
-#~ msgid "F_rom"
-#~ msgstr "O_d"
-
-#~ msgid "Rec_ipients"
-#~ msgstr "_Prejemniki"
-
-#~ msgid "R_eply To"
-#~ msgstr "_Odgovori"
-
-#~ msgid "F_cc"
-#~ msgstr "M_Kp"
-
-#~ msgid "_Request Disposition Notification"
-#~ msgstr "_Zahtevaj obvestilo o prejetju"
-
 #~ msgid "Request Message Disposition Notification"
 #~ msgstr "Zahteva obvestilo o prejetju sporočila"
 
-#~ msgid "_Request Delivery Status Notification"
-#~ msgstr "_Zahtevaj obvestilo o prejetju sporočila"
-
 #~ msgid "Request positive (successful) Delivery Status Notification"
 #~ msgstr "Zahteva je potrjena (uspešno)"
 
-#~ msgid "_Format = Flowed"
-#~ msgstr "_Oblika = Povezana"
-
-#~ msgid "Send as plain text and _HTML"
-#~ msgstr "Pošlji kot običajno besedilo in _HTML"
-
-#~ msgid "_Sign Message"
-#~ msgstr "_Podpiši sporočilo"
-
 #~ msgid "Sign message using GPG"
 #~ msgstr "Podpiše sporočilo z GPG"
 
-#~ msgid "_Encrypt Message"
-#~ msgstr "_Šifriraj sporočilo"
-
 #~ msgid "Encrypt message using GPG"
 #~ msgstr "Šifrira sporočilo z GPG"
 
@@ -8251,15 +9463,6 @@ msgstr "Pomakni trenutno masko nižje"
 #~ msgid "signs the message using GnuPG for all To: and CC: recipients"
 #~ msgstr "podpiše sporočilo z GnuPG za vse prejemnike Za: in Kp:"
 
-#~ msgid "_GnuPG uses MIME mode"
-#~ msgstr "_GnuPG uporablja način MIME"
-
-#~ msgid "_GnuPG uses old OpenPGP mode"
-#~ msgstr "_GnuPG uporablja star način OpenPGP"
-
-#~ msgid "_S/MIME mode (GpgSM)"
-#~ msgstr "_S/MIME način (GpgSM)"
-
 #~ msgid "Open..."
 #~ msgstr "Odpri ..."
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]