[balsa] Updated Slovenian translation

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

commit 4ee808f014614e2049bfb074d82f4e365de2fb7b
Author: Matej Urbančič <mateju svn gnome org>
Date:   Tue Jul 25 12:04:42 2017 +0200

    Updated Slovenian translation

 po/sl.po | 9240 ++++++++++++++++++++++++++++++++++----------------------------
 1 files changed, 5098 insertions(+), 4142 deletions(-)
---
diff --git a/po/sl.po b/po/sl.po
index 96df4d9..a1b3783 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -4,556 +4,604 @@
 #
 # Andraž Tori <andraz tori1 guest arnes si>, 2002.
 # Tadej Janež <tadej_janez email si>, 2003.
-# Matej Urbančič <mateju svn gnome org>, 2006 - 2009.
-#
 # Andrej Žnidaršič <andrej znidarsic gmail com>, 2010.
+# Matej Urbančič <mateju svn gnome org>, 2006-2017.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: balsa\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=balsa&component=general\n";
-"POT-Creation-Date: 2010-08-20 12:16+0000\n"
-"PO-Revision-Date: 2010-08-20 20:22+0100\n"
-"Last-Translator: Andrej Žnidaršič <andrej znidarsic gmail com>\n"
+"Project-Id-Version: balsa master\n"
+"Report-Msgid-Bugs-To: https://bugzilla.gnome.org/enter_bug.cgi?";
+"product=balsa&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2017-07-24 22:44+0200\n"
+"PO-Revision-Date: 2017-07-24 22:47+0200\n"
+"Last-Translator: Matej Urbančič <mateju svn gnome org>\n"
 "Language-Team: Slovenščina <gnome-si googlegroups com>\n"
-"Language: sl\n"
+"Language: sl_SI\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0)\n"
-"X-Poedit-Country: SLOVENIA\n"
-"X-Poedit-Language: Slovenian\n"
+"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"
 
-#: ../balsa.desktop.in.h:1
+#: ../balsa.desktop.in.in.h:1 ../balsa-mailto-handler.desktop.in.in.h:1
 msgid "Balsa"
 msgstr "Balsa"
 
-#: ../balsa.desktop.in.h:2
-msgid "E-Mail utility"
-msgstr "Pripomoček elektronske pošte"
-
-#. The externq database doesn't support Id's, sorry!
-#: ../libbalsa/address-book-extern.c:211
-#: ../libbalsa/address-book-ldap.c:496
-#: ../libbalsa/address-book-ldif.c:332
-msgid "No-Id"
-msgstr "Brez-IDja"
-
-#: ../libbalsa/address-book-extern.c:216
-#: ../libbalsa/address-book-extern.c:371
-#: ../libbalsa/address-book-ldap.c:502
-#: ../libbalsa/address-book-ldif.c:311
-#: ../libbalsa/address-book-ldif.c:335
-#: ../libbalsa/address-book-ldif.c:354
-#: ../libbalsa/address-book-ldif.c:358
-#: ../libbalsa/address-book-vcard.c:160
-#: ../libbalsa/address-book-vcard.c:258
-#: ../libbalsa/address.c:403
-msgid "No-Name"
-msgstr "Brez imena"
-
-#: ../libbalsa/address-book-ldap.c:284
-msgid "SASL Interaction\n"
-msgstr "Delovanje SASL\n"
+#: ../balsa.desktop.in.in.h:2 ../balsa-mailto-handler.desktop.in.in.h:2
+#, fuzzy
+#| msgid "E-Mail utility"
+msgid "Email utility"
+msgstr "Pripomoček"
 
-#: ../libbalsa/address-book-ldap.c:331
-msgid "TLS requested but not compiled in"
-msgstr "TLS je bil zahtevan, vendar ni preveden"
+#: ../balsa.desktop.in.in.h:3 ../balsa-mailto-handler.desktop.in.in.h:3
+msgid "Mail Client"
+msgstr "Odjemalec elektronske pošte"
 
-#: ../libbalsa/address-book-ldap.c:611
-msgid "Undefined location of user address book"
-msgstr "Nedoločeno mesto imenika uporabnikov"
+#: ../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:316
-#: ../libbalsa/filter-error.c:47
+#: ../libbalsa/address-book.c:312 ../libbalsa/filter-error.c:45
 msgid "No error"
 msgstr "Brez napake"
 
-#: ../libbalsa/address-book.c:317
+#: ../libbalsa/address-book.c:313
 msgid "Cannot read from address book"
 msgstr "Ni mogoče brati iz imenika"
 
-#: ../libbalsa/address-book.c:318
+#: ../libbalsa/address-book.c:314
 msgid "Cannot write to address book"
 msgstr "Ni mogoče pisati v imenik"
 
-#: ../libbalsa/address-book.c:319
+#: ../libbalsa/address-book.c:315
 msgid "Cannot connect to the server"
 msgstr "Povezava s strežnikom ni mogoča"
 
-#: ../libbalsa/address-book.c:320
+#: ../libbalsa/address-book.c:316
 msgid "Cannot search in the address book"
 msgstr "Ni mogoče iskati v imeniku"
 
-#: ../libbalsa/address-book.c:322
+#: ../libbalsa/address-book.c:318
 msgid "Cannot add duplicate entry"
 msgstr "Ni mogoče dodati dvojnega vnosa"
 
-#: ../libbalsa/address-book.c:324
+#: ../libbalsa/address-book.c:320
 msgid "Cannot find address in address book"
 msgstr "Ni mogoče najti naslova v imeniku"
 
-#: ../libbalsa/address-book.c:325
-#: ../src/main-window.c:2334
-#: ../src/main-window.c:4779
-#: ../src/sendmsg-window.c:4147
+#: ../libbalsa/address-book.c:321 ../src/main-window.c:2922
+#: ../src/main-window.c:4226 ../src/sendmsg-window.c:3820
 msgid "Unknown error"
 msgstr "Neznana napaka"
 
-#: ../libbalsa/address-view.c:129
-#: ../src/balsa-mime-widget-message.c:738
-#: ../src/balsa-print-object-header.c:170
-#: ../src/sendmsg-window.c:1106
-#: ../src/sendmsg-window.c:3810
-#: ../src/store-address.c:332
-msgid "To:"
-msgstr "Za:"
+#. The externq database doesn't support Id's, sorry!
+#: ../libbalsa/address-book-extern.c:209 ../libbalsa/address-book-ldif.c:233
+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/rfc6350.c:112
+msgid "No-Name"
+msgstr "Brez imena"
 
-#: ../libbalsa/address-view.c:130
-#: ../src/balsa-mime-widget-message.c:739
-#: ../src/balsa-print-object-header.c:172
-#: ../src/sendmsg-window.c:1106
-#: ../src/sendmsg-window.c:3818
-#: ../src/store-address.c:333
-msgid "Cc:"
-msgstr "Kp:"
+#: ../libbalsa/address-book-ldap.c:280
+msgid "SASL Interaction\n"
+msgstr "Delovanje SASL\n"
 
-#: ../libbalsa/address-view.c:131
-#: ../src/balsa-mime-widget-message.c:740
-#: ../src/balsa-print-object-header.c:174
-#: ../src/sendmsg-window.c:1106
-#: ../src/store-address.c:334
-msgid "Bcc:"
-msgstr "Skp:"
+#: ../libbalsa/address-book-ldap.c:327
+msgid "TLS requested but not compiled in"
+msgstr "TLS je bil zahtevan, vendar ni kodno preveden"
 
-#: ../libbalsa/address-view.c:133
-msgid "Reply To:"
-msgstr "Odgovori na:"
+#: ../libbalsa/address-book-ldap.c:606
+msgid "Undefined location of user address book"
+msgstr "Nedoločeno mesto imenika uporabnikov"
 
-#: ../libbalsa/address.c:949
+#: ../libbalsa/address-book-osmo.c:146
+#, fuzzy, c-format
+#| msgid "Removing duplicates failed: %s"
+msgid "Reading Osmo contacts failed: %s"
+msgstr "Napaka med branjem odgovora posredniškega strežnika: %s\n"
+
+#: ../libbalsa/address.c:952
 msgid "D_isplayed Name:"
 msgstr "P_rikazano ime:"
 
-#: ../libbalsa/address.c:950
+#: ../libbalsa/address.c:953
 msgid "_First Name:"
 msgstr "_Ime:"
 
-#: ../libbalsa/address.c:951
+#: ../libbalsa/address.c:954
 msgid "_Last Name:"
 msgstr "_Priimek:"
 
-#: ../libbalsa/address.c:952
+#: ../libbalsa/address.c:955
 msgid "_Nickname:"
 msgstr "_Vzdevek:"
 
-#: ../libbalsa/address.c:953
+#: ../libbalsa/address.c:956
 msgid "O_rganization:"
 msgstr "_Organizacija:"
 
-#: ../libbalsa/address.c:954
+#: ../libbalsa/address.c:957
 msgid "_Email Address:"
-msgstr "_E-poštni naslov:"
+msgstr "_Elektronski naslov:"
 
-#. Right/Add button
-#: ../libbalsa/address.c:973
-#: ../src/filter-edit-callbacks.c:1067
-#: ../src/filter-run-dialog.c:329
+#: ../libbalsa/address.c:976 ../src/filter-edit-callbacks.c:1077
 msgid "A_dd"
 msgstr "_Dodaj"
 
-#: ../libbalsa/body.c:123
-#: ../libbalsa/mailbox_local.c:1765
-#: ../libbalsa/message.c:845
+#: ../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
+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
+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
+msgid "BCC:"
+msgstr "Skp:"
+
+#: ../libbalsa/address-view.c:163
+msgid "Reply To:"
+msgstr "Odgovori na:"
+
+#: ../libbalsa/body.c:121 ../libbalsa/mailbox_local.c:1841
+#: ../libbalsa/message.c:846
 msgid "(No subject)"
 msgstr "(brez zadeve)"
 
-#: ../libbalsa/body.c:352
-#: ../libbalsa/body.c:399
+#: ../libbalsa/body.c:389 ../libbalsa/body.c:436
 #, c-format
 msgid "Failed to create output stream"
 msgstr "Ustvarjanje izhodnega pretoka je spodletelo"
 
-#: ../libbalsa/body.c:543
+#: ../libbalsa/body.c:568
 #, c-format
 msgid "Could not read embedded message"
 msgstr "Vključenega sporočila ni mogoče prebrati"
 
-#: ../libbalsa/filter-error.c:48
-msgid "Syntax error in the filter configuration file"
-msgstr "Napaka skladnje v nastavitveni datoteki filtra"
-
-#: ../libbalsa/filter-error.c:49
-msgid "Unable to allocate memory"
-msgstr "Ni mogoče dodeliti pomnilnika"
-
-#: ../libbalsa/filter-error.c:50
-msgid "Error in regular expression syntax"
-msgstr "Napaka skladnje logičnega izraza"
-
-#: ../libbalsa/filter-error.c:51
-msgid "Attempt to apply an invalid filter"
-msgstr "Poskus uveljavitve neveljavnega filtra"
-
-#: ../libbalsa/filter-file.c:141
-#, c-format
-msgid "Invalid filters %s for mailbox %s"
-msgstr "Neveljavni filtri %s za poštni predal %s"
-
-#: ../libbalsa/filter.c:129
-#: ../libbalsa/mailbox_local.c:845
+#: ../libbalsa/filter.c:125 ../libbalsa/mailbox_local.c:871
 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:236
+#: ../libbalsa/filter.c:232
 #, c-format
 msgid "Invalid filter: %s"
 msgstr "Neveljaven filter: %s"
 
-#: ../libbalsa/filter.c:284
-#: ../libbalsa/filter.c:307
+#: ../libbalsa/filter.c:280 ../libbalsa/filter.c:303
 #, c-format
 msgid "Bad mailbox name for filter: %s"
 msgstr "Slabo ime poštnega predala za filter: %s"
 
-#: ../libbalsa/filter.c:288
+#: ../libbalsa/filter.c:284
 #, c-format
 msgid "Error when copying messages: %s"
 msgstr "Napaka med kopiranjem sporočil: %s"
 
-#: ../libbalsa/filter.c:298
+#: ../libbalsa/filter.c:294
 #, c-format
 msgid "Error when trashing messages: %s"
-msgstr "Napaka med metanjem sporočil v smeti: %s"
+msgstr "Napaka med premikanjem sporočil v smeti: %s"
 
-#: ../libbalsa/filter.c:311
+#: ../libbalsa/filter.c:307
 #, c-format
 msgid "Error when moving messages: %s"
 msgstr "Napaka med premikanjem sporočil: %s"
 
-#: ../libbalsa/gmime-application-pkcs7.c:237
-#: ../libbalsa/gmime-application-pkcs7.c:380
-#, c-format
-msgid "Failed to decrypt MIME part: parse error"
-msgstr "Napaka med dešifriranjem dela MIME: napaka razčlenitve"
+#: ../libbalsa/filter-error.c:46
+msgid "Syntax error in the filter configuration file"
+msgstr "Napaka skladnje v nastavitveni datoteki filtra"
 
-#: ../libbalsa/gmime-gpgme-context.c:300
-#: ../libbalsa/rfc3156.c:1730
-#, c-format
-msgid ""
-"The passphrase for this key was bad, please try again!\n"
-"\n"
-"Key: %s"
-msgstr ""
-"Šifrirna fraza za ta ključ je slaba. Poskusite znova!\n"
-"\n"
-"Ključ: %s"
+#: ../libbalsa/filter-error.c:47
+msgid "Unable to allocate memory"
+msgstr "Ni mogoče dodeliti pomnilnika"
 
-#: ../libbalsa/gmime-gpgme-context.c:305
-#: ../libbalsa/rfc3156.c:1735
+#: ../libbalsa/filter-error.c:48
+msgid "Error in regular expression syntax"
+msgstr "Napaka skladnje logičnega izraza"
+
+#: ../libbalsa/filter-error.c:49
+msgid "Attempt to apply an invalid filter"
+msgstr "Poskus uveljavitve neveljavnega filtra"
+
+#: ../libbalsa/filter-file.c:133
 #, c-format
-msgid ""
-"Please enter the passphrase for the secret key!\n"
-"\n"
-"Key: %s"
-msgstr ""
-"Vnesite šifrirno frazo za skrivni ključ!\n"
-"\n"
-"Ključ: %s"
+msgid "Invalid filters %s for mailbox %s"
+msgstr "Neveljavni filtri %s za poštni predal %s"
 
-#: ../libbalsa/gmime-gpgme-context.c:424
-#: ../libbalsa/gmime-gpgme-context.c:497
-#: ../libbalsa/gmime-gpgme-context.c:505
-#: ../libbalsa/gmime-gpgme-context.c:614
-#: ../libbalsa/gmime-gpgme-context.c:694
-msgid "could not get data from stream"
-msgstr "ni mogoče dobiti podatkov iz pretoka"
+#. FIXME: this is hack!
+#: ../libbalsa/filter-funcs.c:381 ../src/balsa-index.c:983
+msgid "To"
+msgstr "Za"
 
-#: ../libbalsa/gmime-gpgme-context.c:429
-#: ../libbalsa/gmime-gpgme-context.c:620
-#: ../libbalsa/gmime-gpgme-context.c:699
-msgid "could not create new data object"
-msgstr "ni mogoče ustvariti novega podatkovnega predmeta"
+#: ../libbalsa/filter-funcs.c:382 ../src/balsa-index.c:351
+msgid "From"
+msgstr "Od"
 
-#: ../libbalsa/gmime-gpgme-context.c:436
-msgid "signing failed"
-msgstr "podpisovanje je spodletelo"
+#: ../libbalsa/filter-funcs.c:383 ../src/balsa-index.c:367
+#: ../src/pref-manager.c:218
+msgid "Subject"
+msgstr "Zadeva"
 
-#: ../libbalsa/gmime-gpgme-context.c:516
-#: ../libbalsa/rfc3156.c:638
-#: ../libbalsa/rfc3156.c:643
-#: ../libbalsa/rfc3156.c:958
-#: ../libbalsa/rfc3156.c:964
-msgid "signature verification failed"
-msgstr "preverjanje podpisa je spodelelo"
+#: ../libbalsa/filter-funcs.c:384
+msgid "CC"
+msgstr "KP"
 
-#: ../libbalsa/gmime-gpgme-context.c:580
+#: ../libbalsa/filter-funcs.c:385
+msgid "Body"
+msgstr "Telo"
+
+#: ../libbalsa/filter-funcs.c:390
 #, 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"
+msgid "Header:%s"
+msgstr "Glava:%s"
 
-#: ../libbalsa/gmime-gpgme-context.c:643
-msgid "signing and encryption failed"
-msgstr "podpis in Å¡ifriranje sta spodletela"
+#: ../libbalsa/filter-funcs.c:412
+msgid "New"
+msgstr "Novo"
 
-#: ../libbalsa/gmime-gpgme-context.c:645
-msgid "encryption failed"
-msgstr "Å¡ifriranje je spodletelo"
+#: ../libbalsa/filter-funcs.c:413 ../src/filter-edit-callbacks.c:1000
+msgid "Deleted"
+msgstr "Izbrisano"
 
-#: ../libbalsa/gmime-gpgme-context.c:708
-#: ../libbalsa/rfc3156.c:777
-#: ../libbalsa/rfc3156.c:782
-msgid "decryption failed"
-msgstr "dešifriranje je spodletelo"
+#: ../libbalsa/filter-funcs.c:414 ../src/filter-edit-callbacks.c:1000
+msgid "Replied"
+msgstr "Odgovorjeno"
 
-#: ../libbalsa/gmime-gpgme-context.c:765
-msgid "could not create context"
-msgstr "ni mogoče ustvariti vsebine"
+#: ../libbalsa/filter-funcs.c:415 ../src/filter-edit-callbacks.c:1000
+msgid "Flagged"
+msgstr "Z zastavico"
 
-#: ../libbalsa/gmime-gpgme-context.c:824
-#, c-format
-msgid "the crypto engine for protocol OpenPGP is not available"
-msgstr "Å¡ifrirni programnik za protokol OpenPGP ni na voljo"
+#: ../libbalsa/filter-funcs.c:439
+msgid "Not "
+msgstr "NE"
 
-#: ../libbalsa/gmime-gpgme-context.c:834
-#, c-format
-msgid "the crypto engine for protocol CMS is not available"
-msgstr "Å¡ifrirni programnik za protokol CMS ni na voljo"
+#: ../libbalsa/filter-funcs.c:455
+msgid "From %Y-%m-%d"
+msgstr "Od %d.&m.%Y"
 
-#: ../libbalsa/gmime-gpgme-context.c:841
-#, c-format
-msgid "invalid crypto engine %d"
-msgstr "neveljaven Å¡ifrirni programnik %d"
+#: ../libbalsa/filter-funcs.c:461
+msgid "To %Y-%m-%d"
+msgstr "Do %d.&m.%Y"
 
-#: ../libbalsa/gmime-gpgme-context.c:872
-#: ../libbalsa/gmime-gpgme-context.c:899
-#, c-format
-msgid "could not list keys for \"%s\""
-msgstr "ključev za \"%s\" ni mogoče našteti"
+#: ../libbalsa/filter-funcs.c:469
+msgid "And"
+msgstr "IN"
 
-#: ../libbalsa/gmime-gpgme-context.c:915
-#, c-format
-msgid "%s: a key for %s is present, but it is expired, disabled, revoked or invalid"
-msgstr "%s: ključ za %s je na prisoten, vendar je potekel, onemogočen, preklican ali pa neveljaven"
+#: ../libbalsa/filter-funcs.c:472
+msgid "Or"
+msgstr "ALI"
 
-#: ../libbalsa/gmime-gpgme-context.c:919
+#: ../libbalsa/gmime-application-pkcs7.c:123
 #, c-format
-msgid "%s: could not find a key for %s"
-msgstr "%s: ni mogoče najti ključa za %s"
+msgid "Failed to decrypt MIME part: parse error"
+msgstr "Napaka med dešifriranjem dela MIME: napaka razčlenitve"
 
-#: ../libbalsa/gmime-gpgme-context.c:924
-#, c-format
-msgid "%s: a key with id %s is present, but it is expired, disabled, revoked or invalid"
-msgstr "%s: ključ z id %s je prisoten, vendar je potekel, onemogočen, preklican ali pa neveljaven"
+#: ../libbalsa/gmime-multipart-crypt.c:220
+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-gpgme-context.c:928
-#, c-format
-msgid "%s: could not find a key with id %s"
-msgstr "%s: ni mogoče najti ključa z ID %s"
+#: ../libbalsa/gmime-multipart-crypt.c:244
+#, fuzzy, c-format
+#| msgid "unsupported protocol '%s'"
+msgid "unsupported protocol “%s”"
+msgstr "Nepodprt protokol »%s«"
 
-#: ../libbalsa/gmime-gpgme-context.c:942
-#, c-format
-msgid "%s: multiple keys for %s"
-msgstr "%s: več ključev za %s"
+#: ../libbalsa/gmime-multipart-crypt.c:257
+msgid ""
+"Cannot verify multipart/signed part: signature content-type does not match "
+"protocol."
+msgstr ""
+"Ni mogoče overiti dela večdelnega predmeta: vrsta vsebine podpisa ni skladna "
+"s protokolom."
 
-#: ../libbalsa/gmime-gpgme-context.c:987
+#: ../libbalsa/gmime-multipart-crypt.c:453
 #, c-format
-msgid "%s: insufficient validity for uid %s"
-msgstr "%s: nezadostna veljavnost za uid %s"
+msgid ""
+"Cannot decrypt multipart/encrypted part: unsupported encryption protocol "
+"“%s”."
+msgstr ""
+"Ni mogoče odšifrirati dela večdelnega predmeta: nepodprt protokol šifriranja "
+"»%s«."
+
+#: ../libbalsa/gmime-multipart-crypt.c:454
+msgid "(none)"
+msgstr "(brez)"
+
+#: ../libbalsa/gmime-multipart-crypt.c:467
+msgid ""
+"Cannot decrypt multipart/encrypted part: content-type does not match "
+"protocol."
+msgstr ""
+"Ni mogoče odšifrirati dela večdelnega predmeta: vrsta vsebine ni skladna s "
+"protokolom."
 
-#: ../libbalsa/html.c:68
+#: ../libbalsa/gmime-multipart-crypt.c:482
+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
+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
 #, c-format
 msgid "Could not get an HTML part: %s"
 msgstr "Ni mogoče dobiti dela HTML: %s"
 
-#: ../libbalsa/html.c:340
-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 you trust the server."
-msgstr "Ta del sporočila vsebuje slike z oddaljenega strežnika. Za zaščito vaše zasebnosti niso bile 
prenesene. V primeru da zaupate strežniku, lahko izberete njihov prejem."
+#: ../libbalsa/html.c:119
+#, fuzzy, c-format
+#| msgid "Could not get an HTML part: %s"
+msgid "Could not convert HTML part to text: %s"
+msgstr "Ni mogoče shraniti besedilnega dela: %s"
+
+#: ../libbalsa/html.c:400
+#, fuzzy
+#| 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 you trust the server."
+msgid ""
+"This message part contains images from a remote server.\n"
+"To protect your privacy, Balsa has not downloaded them.\n"
+"You may choose to download them if you trust the server."
+msgstr ""
+"Ta del sporočila vsebuje slike z oddaljenega strežnika. Za zaščito vaše "
+"zasebnosti niso bile prenesene. V primeru da zaupate strežniku, lahko "
+"izberete njihov prejem."
+
+#: ../libbalsa/html.c:408 ../libbalsa/html.c:1076
+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 "
+"you trust the server."
+msgstr ""
+"Ta del sporočila vsebuje slike z oddaljenega strežnika. Za zaščito vaše "
+"zasebnosti niso bile prenesene. V primeru da zaupate strežniku, lahko "
+"izberete njihov prejem."
 
-#: ../libbalsa/html.c:348
+#: ../libbalsa/html.c:417 ../libbalsa/html.c:1087
 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:103
-#: ../libbalsa/mailbox_local.c:1884
-#: ../libbalsa/mailbox_local.c:1886
-#: ../src/sendmsg-window.c:4044
-#: ../src/sendmsg-window.c:4046
+#: ../libbalsa/identity.c:99 ../libbalsa/mailbox_local.c:1964
+#: ../libbalsa/mailbox_local.c:1966 ../src/sendmsg-window.c:3768
+#: ../src/sendmsg-window.c:3770
 msgid "Re:"
 msgstr "Od:"
 
 # Naj se ta niz prevaja ali ne ??
-#: ../libbalsa/identity.c:104
-#: ../src/sendmsg-window.c:3984
-#: ../src/sendmsg-window.c:3985
-#: ../src/sendmsg-window.c:3986
+#: ../libbalsa/identity.c:100 ../src/sendmsg-window.c:3708
+#: ../src/sendmsg-window.c:3709 ../src/sendmsg-window.c:3710
 msgid "Fwd:"
 msgstr "Pos:"
 
-#: ../libbalsa/identity.c:165
+#: ../libbalsa/identity.c:160
 msgid "New Identity"
 msgstr "Nova istovetnost"
 
-#: ../libbalsa/identity.c:345
-#, c-format
-msgid "Error executing signature generator %s"
-msgstr "Napaka med izvajanjem ustvarjalnika podpisov %s"
+#: ../libbalsa/identity.c:337
+#, fuzzy, c-format
+#| msgid "Error executing signature generator %s"
+msgid "Error executing signature generator “%s”: %s"
+msgstr "Napaka pri izvajanju ukaza: %s."
 
-#: ../libbalsa/identity.c:355
-#, c-format
-msgid "Cannot open signature file '%s' for reading"
-msgstr "Ni mogoče odpreti datoteke podpisa '%s' za branje"
-
-#: ../libbalsa/identity.c:361
-#, c-format
-msgid "Error reading signature from %s"
-msgstr "Napaka med branjem podpisa iz %s"
+#: ../libbalsa/identity.c:346
+#, 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."
 
-#: ../libbalsa/identity.c:366
+#: ../libbalsa/identity.c:357
 #, c-format
 msgid "Signature in %s is not a UTF-8 text."
 msgstr "Podpis v %s ni besedilo UTF-8."
 
-#: ../libbalsa/identity.c:497
+#: ../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
+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
+msgid "_OK"
+msgstr "_V redu↓"
+
+#: ../libbalsa/identity.c:481
 msgid "Current"
 msgstr "Trenutna"
 
-#: ../libbalsa/identity.c:751
-#: ../libbalsa/smtp-server.c:270
+#: ../libbalsa/identity.c:731 ../libbalsa/smtp-server.c:179
 msgid "Default"
 msgstr "Privzeta"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:950
+#: ../libbalsa/identity.c:933
 msgid "_Face Path"
 msgstr "_Face Pot"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:956
+#: ../libbalsa/identity.c:939
 msgid "_X-Face Path"
 msgstr "_X-Face pot"
 
 #. create the "General" tab
-#: ../libbalsa/identity.c:984
+#: ../libbalsa/identity.c:962
 msgid "General"
 msgstr "Splošno"
 
-#: ../libbalsa/identity.c:986
+#: ../libbalsa/identity.c:964
 msgid "_Identity name:"
 msgstr "Ime _istovetnosti:"
 
-#: ../libbalsa/identity.c:988
+#: ../libbalsa/identity.c:966
 msgid "_Full name:"
 msgstr "Polno _Ime:"
 
-#: ../libbalsa/identity.c:990
+#: ../libbalsa/identity.c:968
 msgid "_Mailing address:"
 msgstr "_Naslov pošiljanja:"
 
-#: ../libbalsa/identity.c:992
+#: ../libbalsa/identity.c:970
 msgid "Reply _to:"
 msgstr "Odgovori_na:"
 
-#: ../libbalsa/identity.c:994
+#: ../libbalsa/identity.c:972
 msgid "_Domain:"
 msgstr "_Domena:"
 
 #. create the "Messages" tab
-#: ../libbalsa/identity.c:998
+#: ../libbalsa/identity.c:976
 msgid "Messages"
 msgstr "Sporočila"
 
-#: ../libbalsa/identity.c:1000
-msgid "_Bcc:"
+#: ../libbalsa/identity.c:978
+msgid "_BCC:"
 msgstr "_Skp:"
 
-#: ../libbalsa/identity.c:1002
+#: ../libbalsa/identity.c:980
 msgid "Reply _string:"
 msgstr "Niz za od_govor:"
 
-#: ../libbalsa/identity.c:1004
+#: ../libbalsa/identity.c:982
 msgid "F_orward string:"
 msgstr "Niz za p_osredovanje:"
 
-#: ../libbalsa/identity.c:1007
+#: ../libbalsa/identity.c:985
 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:1010
+#: ../libbalsa/identity.c:988
+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
 msgid "request _Message Disposition Notification by default"
 msgstr "privzeto zahtevaj obvestilo o _prejemu sporočila"
 
-#: ../libbalsa/identity.c:1020
+#: ../libbalsa/identity.c:1001
 msgid "SMT_P server:"
 msgstr "Strežnik SMT_P:"
 
 #. create the "Signature" tab
-#: ../libbalsa/identity.c:1025
+#: ../libbalsa/identity.c:1005
 msgid "Signature"
 msgstr "Podpis"
 
-#: ../libbalsa/identity.c:1028
+#: ../libbalsa/identity.c:1008
 msgid "Signature _path"
 msgstr "_Pot podpisa"
 
-#: ../libbalsa/identity.c:1031
+#: ../libbalsa/identity.c:1011
 msgid "_Execute signature"
 msgstr "I_zvedi podpis"
 
-#: ../libbalsa/identity.c:1034
+#: ../libbalsa/identity.c:1014
 msgid "Incl_ude signature"
 msgstr "_Vključi podpis"
 
-#: ../libbalsa/identity.c:1037
+#: ../libbalsa/identity.c:1017
 msgid "Include signature when for_warding"
 msgstr "Vključi podpis ob _posredovanju"
 
-#: ../libbalsa/identity.c:1040
+#: ../libbalsa/identity.c:1020
 msgid "Include signature when rep_lying"
 msgstr "Vključi podpis ob _odgovarjanju"
 
-#: ../libbalsa/identity.c:1043
+#: ../libbalsa/identity.c:1023
 msgid "_Add signature separator"
 msgstr "Dodaj ločni_co podpisa"
 
-#: ../libbalsa/identity.c:1046
+#: ../libbalsa/identity.c:1026
 msgid "Prepend si_gnature"
 msgstr "Dodaj podpis na zače_tek"
 
-#: ../libbalsa/identity.c:1052
+#: ../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\n"
-"only if Balsa is built with cryptographic support."
+"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:1057
+#: ../libbalsa/identity.c:1037
 msgid "Security"
 msgstr "Varnost"
 
-#: ../libbalsa/identity.c:1060
+#: ../libbalsa/identity.c:1040
 msgid "sign messages by default"
 msgstr "samodejno podpiši sporočila"
 
-#: ../libbalsa/identity.c:1063
+#: ../libbalsa/identity.c:1043
 msgid "encrypt messages by default"
 msgstr "samodejno šifriraj sporočila"
 
-#: ../libbalsa/identity.c:1066
+#: ../libbalsa/identity.c:1046
 msgid "default protocol"
 msgstr "privzet protokol"
 
-#: ../libbalsa/identity.c:1069
+#: ../libbalsa/identity.c:1049
 msgid "always trust GnuPG keys when encrypting"
 msgstr "med šifriranjem vedno zaupaj ključem GnuPG"
 
-#: ../libbalsa/identity.c:1072
+#: ../libbalsa/identity.c:1052
 msgid "remind me if messages can be encrypted"
 msgstr "opomni, če je sporočila mogoče šifrirati"
 
-#: ../libbalsa/identity.c:1075
+#: ../libbalsa/identity.c:1055
 msgid ""
 "use secret key with this id for signing\n"
 "(leave empty for automatic selection)"
@@ -561,65 +609,85 @@ msgstr ""
 "uporabi skrivni ključ s tem ID za podpisovanje\n"
 "(pustite prazno za samodejen izbor)"
 
-#: ../libbalsa/identity.c:1209
+#: ../libbalsa/identity.c:1189
 #, c-format
 msgid "Error reading file %s: %s"
 msgstr "Napaka med branjem datoteke %s: %s"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/identity.c:1219
+#: ../libbalsa/identity.c:1199
 #, 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:1229
+#: ../libbalsa/identity.c:1209
 #, 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:1249
-#: ../src/balsa-message.c:1576
+#: ../libbalsa/identity.c:1229 ../src/balsa-message.c:1591
 #, c-format
 msgid "Error loading Face: %s"
 msgstr "Napaka med nalaganjem Face: %s"
 
-#: ../libbalsa/identity.c:1428
+#: ../libbalsa/identity.c:1408
 msgid "Error: The identity does not have a name"
 msgstr "Napaka: istovetnost nima imena"
 
-#: ../libbalsa/identity.c:1438
+#: ../libbalsa/identity.c:1418
 msgid "Error: An identity with that name already exists"
 msgstr "Napaka: istovetnost s tem imenom že obstaja"
 
-#: ../libbalsa/identity.c:1637
+#: ../libbalsa/identity.c:1611
 msgid "Do you really want to delete the selected identity?"
 msgstr "Ali zares želite izbrisati izbrano istovetnost?"
 
-#: ../libbalsa/identity.c:1674
+#: ../libbalsa/identity.c:1656
 #, c-format
 msgid "Error displaying help for identities: %s\n"
 msgstr "Napaka med prikazovanjem pomoči za istovetnosti: %s\n"
 
-#: ../libbalsa/identity.c:1720
+#: ../libbalsa/identity.c:1695
 msgid "Manage Identities"
 msgstr "Upravljanje istovetnosti"
 
-#: ../libbalsa/identity.c:2113
+#: ../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
+msgid "_Help"
+msgstr "Pomo_č"
+
+#. new button
+#: ../libbalsa/identity.c:1700 ../src/filter-edit-dialog.c:224
+#: ../src/mailbox-node.c:1078
+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
+msgid "_Remove"
+msgstr "Od_strani"
+
+#: ../libbalsa/identity.c:2083
 msgid "GnuPG MIME mode"
 msgstr "Način GnuPG MIME"
 
-#: ../libbalsa/identity.c:2115
+#: ../libbalsa/identity.c:2085
 msgid "GnuPG OpenPGP mode"
 msgstr "Način GnuPG OpenPGP"
 
-#: ../libbalsa/identity.c:2118
+#: ../libbalsa/identity.c:2087
 msgid "GpgSM S/MIME mode"
 msgstr "Način GpgSM S/MIME "
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:321
+#: ../libbalsa/imap-server.c:288
 #, c-format
 msgid ""
 "IMAP server %s alert:\n"
@@ -629,75 +697,92 @@ msgstr ""
 "%s"
 
 #. IMAP host name + message
-#: ../libbalsa/imap-server.c:325
+#: ../libbalsa/imap-server.c:292
 #, c-format
 msgid "IMAP server %s error: %s"
 msgstr "Napaka strežnika IMAP %s: %s"
 
-#. IMAP host name + message
-#: ../libbalsa/imap-server.c:331
-#, c-format
-msgid "%s: %s"
-msgstr "%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:577
-#: ../libbalsa/server.c:348
-#: ../libbalsa/server.c:392
+#: ../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
 #, 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:633 ../libbalsa/imap-server.c:638
 #, c-format
 msgid "Cannot connect to the server: %s"
 msgstr "Ni se mogoče povezati s strežnikom: %s"
 
-#: ../libbalsa/imap-server.c:786
+#: ../libbalsa/imap-server.c:787
 #, c-format
 msgid "Exceeded the number of connections per server %s"
 msgstr "Prekoračeno je število povezav na strežnik %s"
 
-#: ../libbalsa/libbalsa-conf.c:143
-msgid "Your Balsa configuration is now stored in \"~/.balsa/config\"."
-msgstr "Nastavitve programa Balsa so shranjene v \"~/.balsa/config\"."
-
-#: ../libbalsa/libbalsa-vfs.c:558
-#: ../src/sendmsg-window.c:5168
-#, c-format
-msgid "not a regular file"
-msgstr "ni običajna datoteka"
-
-#: ../libbalsa/libbalsa-vfs.c:610
-#, c-format
-msgid "Cannot launch, missing application"
-msgstr "Ni mogoče zagnati; manjka program"
-
-#: ../libbalsa/libbalsa-vfs.c:676
-#, c-format
-msgid "Open with %s"
-msgstr "Odpri z %s"
-
-#: ../libbalsa/libbalsa-vfs.c:729
-#, c-format
-msgid "Open _part with %s"
-msgstr "Odpri _del z %s"
-
-#: ../libbalsa/libbalsa.c:382
+#: ../libbalsa/libbalsa.c:369
 msgid "Invalid date"
 msgstr "Neveljaven datum"
 
-#: ../libbalsa/libbalsa.c:398
-#: ../src/pref-manager.c:1408
-#: ../src/pref-manager.c:1504
+#: ../libbalsa/libbalsa.c:386 ../src/pref-manager.c:934
+#: ../src/pref-manager.c:3600
 msgid "Unknown"
 msgstr "Neznan"
 
+#: ../libbalsa/libbalsa.c:528 ../libbalsa/libbalsa.c:633
+msgid "SSL/TLS certificate"
+msgstr "Potrdilo SSL/TLS"
+
+#: ../libbalsa/libbalsa.c:532 ../libbalsa/libbalsa.c:637
+msgid "_Accept Once"
+msgstr "Sprejmi _enkrat"
+
+#: ../libbalsa/libbalsa.c:533 ../libbalsa/libbalsa.c:638
+msgid "Accept & _Save"
+msgstr "Sprejmi in _shrani"
+
+#: ../libbalsa/libbalsa.c:534 ../libbalsa/libbalsa.c:639
+msgid "_Reject"
+msgstr "_Zavrni"
+
 #: ../libbalsa/libbalsa.c:544
+#, fuzzy, c-format
+#| msgid ""
+#| "Authenticity of this certificate could not be verified.\n"
+#| "<b>Reason:</b> %s\n"
+#| "<b>This certificate belongs to:</b>\n"
+msgid ""
+"<big><b>Authenticity of this certificate could not be verified.</b></big>\n"
+"Reason: %s"
+msgstr ""
+"Pristnosti uporabljenega potrdila ni mogoče preveriti.\n"
+"<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"
@@ -708,7 +793,7 @@ msgstr ""
 "<b>Vzrok:</b> %s\n"
 "<b>To potrdilo pripada:</b>\n"
 
-#: ../libbalsa/libbalsa.c:556
+#: ../libbalsa/libbalsa.c:603
 msgid ""
 "\n"
 "<b>This certificate was issued by:</b>\n"
@@ -716,7 +801,7 @@ msgstr ""
 "\n"
 "<b>Potrdilo je izdal:</b>\n"
 
-#: ../libbalsa/libbalsa.c:567
+#: ../libbalsa/libbalsa.c:614
 #, c-format
 msgid ""
 "<b>This certificate is valid</b>\n"
@@ -729,106 +814,545 @@ msgstr ""
 "do %s\n"
 "<b>Prstni odtis:</b> %s"
 
-#: ../libbalsa/libbalsa.c:576
-msgid "SSL/TLS certificate"
-msgstr "Potrdilo SSL/TLS"
-
-#: ../libbalsa/libbalsa.c:578
-msgid "_Accept Once"
-msgstr "Sprejmi _enkrat"
-
-#: ../libbalsa/libbalsa.c:579
-msgid "Accept&_Save"
-msgstr "Sprejmi in _shrani"
-
-#: ../libbalsa/libbalsa.c:580
-msgid "_Reject"
-msgstr "_Zavrni"
-
-#: ../libbalsa/libbalsa.c:626
+#: ../libbalsa/libbalsa.c:688
 #, c-format
 msgid "Connection to %s timed out. Abort?"
 msgstr "Povezava z %s je zakasnela. Ali naj bo preklicana?"
 
-#: ../libbalsa/libbalsa.c:872
+#: ../libbalsa/libbalsa.c:845
 #, c-format
 msgid "No image data"
 msgstr "Ni podatkov slike"
 
-#: ../libbalsa/libbalsa.c:916
+#: ../libbalsa/libbalsa.c:879
 #, c-format
 msgid "Invalid input format"
 msgstr "Neveljavna oblika vnosa"
 
-#: ../libbalsa/libbalsa.c:920
+#: ../libbalsa/libbalsa.c:883
 #, c-format
 msgid "Internal buffer overrun"
 msgstr "Notranja prekoračitev medpomnilnika"
 
 #. Translators: please do not translate Face.
-#: ../libbalsa/libbalsa.c:937
+#: ../libbalsa/libbalsa.c:900
 #, c-format
 msgid "Bad X-Face data"
 msgstr "Slabi podatki X-Face"
 
-#: ../libbalsa/mailbox.c:522
+#: ../libbalsa/libbalsa-conf.c:143
+#, 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
+msgid "could not create context"
+msgstr "ni mogoče ustvariti vsebine"
+
+#: ../libbalsa/libbalsa-gpgme.c:200
+#, 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
+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
+msgid "signature verification failed"
+msgstr "preverjanje podpisa je spodelelo"
+
+#: ../libbalsa/libbalsa-gpgme.c:381 ../libbalsa/libbalsa-gpgme.c:505
+#: ../libbalsa/libbalsa-gpgme.c:597
+msgid "could not create new data object"
+msgstr "ni mogoče ustvariti novega podatkovnega predmeta"
+
+#: ../libbalsa/libbalsa-gpgme.c:390
+msgid "signing failed"
+msgstr "podpisovanje je spodletelo"
+
+#: ../libbalsa/libbalsa-gpgme.c:464
+#, 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
+msgid "signing and encryption failed"
+msgstr "podpis in Å¡ifriranje sta spodletela"
+
+#: ../libbalsa/libbalsa-gpgme.c:534
+msgid "encryption failed"
+msgstr "Å¡ifriranje je spodletelo"
+
+#: ../libbalsa/libbalsa-gpgme.c:607 ../libbalsa/rfc3156.c:434
+#: ../libbalsa/rfc3156.c:439
+msgid "decryption failed"
+msgstr "dešifriranje je spodletelo"
+
+#: ../libbalsa/libbalsa-gpgme.c:760
+#, fuzzy, c-format
+#| msgid ""
+#| "%s: a key for %s is present, but it is expired, disabled, revoked or "
+#| "invalid"
+msgid ""
+"A key for “%s” is present, but it is expired, disabled, revoked or invalid"
+msgstr ""
+"%s: ključ za %s je na prisoten, vendar je potekel, onemogočen, preklican ali "
+"pa neveljaven"
+
+#: ../libbalsa/libbalsa-gpgme.c:763
+#, 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
+#, fuzzy, c-format
+#| msgid "%s: multiple keys for %s"
+msgid "Multiple keys for “%s”"
+msgstr "Več ključev"
+
+#: ../libbalsa/libbalsa-gpgme.c:800
+#, 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
+msgid "Select key"
+msgstr "Izberi ključ"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:174
+#, c-format
+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"
+msgstr "Izberite javni ključ za prejemnika %s"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:184
+#, c-format
+msgid ""
+"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
+#, c-format
+msgid ""
+"The owner trust for this key is “%s” only.\n"
+"Use this key anyway?"
+msgstr ""
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:325
+#, fuzzy
+#| msgid "Insufficient trust for recipient %s"
+msgid "Insufficient key owner trust"
+msgstr ""
+"\n"
+"Zaupanje lastniku ključa: %s"
+
+#. FIXME: create dialog according to the Gnome HIG
+#: ../libbalsa/libbalsa-gpgme-cb.c:355
+msgid "Enter Passphrase"
+msgstr "Vnesite Å¡ifrirno frazo"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:383
+#, c-format
+msgid ""
+"%s\n"
+"The passphrase for this key was bad, please try again!\n"
+"\n"
+"Key: %s"
+msgstr ""
+"%s\n"
+"Šifrirna fraza za ta ključ je slaba. Poskusite znova!\n"
+"\n"
+"Ključ: %s"
+
+#: ../libbalsa/libbalsa-gpgme-cb.c:388
+#, c-format
+msgid ""
+"%s\n"
+"Please enter the passphrase for the secret key!\n"
+"\n"
+"Key: %s"
+msgstr ""
+"%s\n"
+"Vnesite šifrirno frazo za skrivni ključ!\n"
+"\n"
+"Ključ: %s"
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:81
+msgid "error setting key list mode"
+msgstr ""
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:88 ../libbalsa/libbalsa-gpgme-keys.c:113
+#, 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
+msgid "Cannot find a key with fingerprint %s on the key server."
+msgstr ""
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:238
+#, c-format
+msgid ""
+"Found %u keys with fingerprint %s on the key server. Please check and import "
+"the proper key manually"
+msgstr ""
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:246
+#, 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
+#, fuzzy
+msgid "error importing key"
+msgstr "Napaka uvoza podatkov"
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:333
+#, fuzzy
+msgid "No key was imported or updated."
+msgstr "Vrednost za posodobitev"
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:336
+#, 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
+#, 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
+#, c-format
+msgid ""
+"\n"
+"• %d new user ID"
+msgid_plural ""
+"\n"
+"• %d new user IDs"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:348
+#, c-format
+msgid ""
+"\n"
+"• %d new subkey"
+msgid_plural ""
+"\n"
+"• %d new subkeys"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:353
+#, fuzzy, c-format
+#| msgid "Incl_ude signature"
+msgid ""
+"\n"
+"• %d new signature"
+msgid_plural ""
+"\n"
+"• %d new signatures"
+msgstr[0] "_Vključi podpis"
+msgstr[1] "_Vključi podpis"
+msgstr[2] "_Vključi podpis"
+msgstr[3] "_Vključi podpis"
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:359
+#, c-format
+msgid ""
+"\n"
+"• %d new revocation"
+msgid_plural ""
+"\n"
+"• %d new revocations"
+msgstr[0] ""
+msgstr[1] ""
+msgstr[2] ""
+msgstr[3] ""
+
+#: ../libbalsa/libbalsa-gpgme-keys.c:365
+msgid "No changes for the key were found on the key server."
+msgstr ""
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:74
+#, fuzzy
+msgid "Key status:"
+msgstr "S _stanjem"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:80
+#: ../libbalsa/libbalsa-gpgme-widgets.c:87
+msgid "User ID:"
+msgstr "ID uporabnika"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:80
+msgid "None"
+msgstr "Brez obrobe"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:85
+#, fuzzy
+msgid "Primary user ID:"
+msgstr "Ni mogoče zamenjati ID osnovnega uporabnika"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:97
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "Key owner trust: %s"
+msgid "Key owner trust:"
+msgstr ""
+"\n"
+"Zaupanje lastniku ključa: %s"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:107
+#, fuzzy
+msgid "Additional User IDs"
+msgstr "Dodatno"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:125
+msgid "Issuer"
+msgstr "Izdajatelj"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:136
+msgid "Name:"
+msgstr "Name:"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:140
+msgid "Serial number:"
+msgstr "Zaporedna Å¡tevilka:"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:143
+msgid "Chain ID:"
+msgstr "ID verige"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:154
+msgid "Subkey used"
+msgstr "Uporabljen podključ"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:162
+#, c-format
+msgid "Subkeys (%s only)"
+msgstr "Podključi (le %s)"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:167
+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
+msgid "Status:"
+msgstr "Stanje:"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:447
+msgid "Fingerprint:"
+msgstr "Prstni odtis:"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:452
+msgid "Capabilities:"
+msgstr "Zmožnosti:"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:457
+#, fuzzy
+#| msgid "Invalid date"
+msgid "invalid timestamp"
+msgstr "Neveljavna vrednost časovnega žiga '%s'"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:459
+msgid "not available"
+msgstr "ni na voljo"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:463
+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
+msgid "Expires:"
+msgstr "Preteče dne:"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:502
+#, fuzzy
+msgid "sign"
+msgstr "Podpiši"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:505
+#, fuzzy
+#| msgid "Encrypt"
+msgid "encrypt"
+msgstr "Å ifriraj"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:508
+#, fuzzy
+msgid "certify"
+msgstr "Potrdi"
+
+#: ../libbalsa/libbalsa-gpgme-widgets.c:511
+#, fuzzy
+msgid "authenticate"
+msgstr "Overi"
+
+#: ../libbalsa/libbalsa-progress.c:65 ../src/main-window.c:3273
+msgid "_Hide"
+msgstr "_Skrij"
+
+#: ../libbalsa/libbalsa-vfs.c:557 ../src/sendmsg-window.c:4492
+#, c-format
+msgid "not a regular file"
+msgstr "ni običajna datoteka"
+
+#: ../libbalsa/libbalsa-vfs.c:609
+#, c-format
+msgid "Cannot launch, missing application"
+msgstr "Ni mogoče zagnati; manjka program"
+
+#: ../libbalsa/libbalsa-vfs.c:675
+#, c-format
+msgid "Open with %s"
+msgstr "Odpri z %s"
+
+#: ../libbalsa/libbalsa-vfs.c:728
+#, c-format
+msgid "Open _part with %s"
+msgstr "Odpri _del z %s"
+
+#: ../libbalsa/mailbox.c:510
 #, c-format
 msgid "Cannot load mailbox %s"
 msgstr "Ni mogoče naložiti poštnega predala %s"
 
-#: ../libbalsa/mailbox.c:529
+#: ../libbalsa/mailbox.c:517
 #, c-format
 msgid "No such mailbox type: %s"
 msgstr "Ni takšne vrste poštnega predala: %s"
 
-#: ../libbalsa/mailbox.c:546
-#, c-format
-msgid "Bad local mailbox path \"%s\""
-msgstr "Slaba pot do krajevnega poštnega predala \"%s\""
+#: ../libbalsa/mailbox.c:534
+#, 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:551
+#: ../libbalsa/mailbox.c:539
 #, c-format
 msgid "Could not create a mailbox of type %s"
 msgstr "Ni mogoče ustvariti poštnega predala vrste %s"
 
-#: ../libbalsa/mailbox.c:874
+#: ../libbalsa/mailbox.c:854
 #, c-format
 msgid "Applying filter rules to %s"
 msgstr "Uveljavljanje pravil filtra na %s"
 
-#: ../libbalsa/mailbox.c:1029
+#: ../libbalsa/mailbox.c:1019
 #, c-format
 msgid "Copying from %s to %s"
 msgstr "Kopiranje iz %s v %s"
 
-#: ../libbalsa/mailbox.c:1936
+#: ../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:2146
+#: ../libbalsa/mailbox.c:2158
 #, c-format
 msgid "Removing messages from source mailbox failed"
 msgstr "Odstranjevanje sporočil iz izvornega predala je spodletelo"
 
-#: ../libbalsa/mailbox.c:3019
+#: ../libbalsa/mailbox.c:2985
 msgid "from unknown"
 msgstr "od neznanega pošiljatelja"
 
-#: ../libbalsa/mailbox.c:3021
-msgid "Loading..."
-msgstr "Nalaganje ..."
+#: ../libbalsa/mailbox.c:2987
+#, fuzzy
+#| msgid "Loading..."
+msgid "Loading…"
+msgstr "Poteka nalaganje"
 
-#: ../libbalsa/mailbox.c:3991
+#: ../libbalsa/mailbox.c:3957
 #, c-format
 msgid "Searching %s for partial messages"
 msgstr "Iskanje %s za delna sporočila"
 
-#: ../libbalsa/mailbox.c:4081
+#: ../libbalsa/mailbox.c:4047
 msgid "Reconstructing message"
 msgstr "Ponovna izgradnja sporočila"
 
-#: ../libbalsa/mailbox.c:4350
+#: ../libbalsa/mailbox.c:4306
 #, c-format
 msgid "Finding duplicate messages in source mailbox failed"
 msgstr "Iskanje podvojenih sporočil v izvornem poštnem predalu je spodletelo"
@@ -836,38 +1360,40 @@ msgstr "Iskanje podvojenih sporočil v izvornem poštnem predalu je spodletelo"
 #. ImapIssue macro handles reconnecting. We might issue a
 #. LIBBALSA_INFORMATION_MESSAGE here but it would be overwritten by
 #. login information...
-#: ../libbalsa/mailbox_imap.c:619
-msgid "IMAP connection has been severed. Reconnecting..."
+#: ../libbalsa/mailbox_imap.c:613
+#, 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:622
+#: ../libbalsa/mailbox_imap.c:616
 msgid "IMAP protocol error. Try enabling bug workarounds."
 msgstr "Napaka protokola IMAP. Poskusite omogočiti obhode hroščev."
 
-#: ../libbalsa/mailbox_imap.c:625
-#, c-format
-msgid "IMAP server has shut the connection: %s Reconnecting..."
+#: ../libbalsa/mailbox_imap.c:619
+#, 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:637
-#, c-format
-msgid "Async IMAP cmd %s could not be executed. Reconnecting..."
+#: ../libbalsa/mailbox_imap.c:631
+#, 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:1126
-#: ../libbalsa/mailbox_maildir.c:511
-#: ../libbalsa/mailbox_mbox.c:750
-#: ../libbalsa/mailbox_mh.c:547
+#: ../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:1213
+#: ../libbalsa/mailbox_imap.c:1211
 #, c-format
 msgid "Downloading %ld kB"
 msgstr "Prejemanje %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:1612
+#: ../libbalsa/mailbox_imap.c:1610
 #, c-format
 msgid ""
 "IMAP SEARCH command failed for mailbox %s\n"
@@ -876,112 +1402,108 @@ msgstr ""
 "Ukaz IMAP SEARCH je za poštni predal %s spodletel\n"
 "vrnjeno na privzet način iskanja"
 
-#: ../libbalsa/mailbox_imap.c:1672
-#, c-format
-msgid "No path found for mailbox \"%s\", using \"%s\""
-msgstr "Za poštni predal \"%s\" ni mogoče najti poti, uporabljen bo \"%s\""
+#: ../libbalsa/mailbox_imap.c:1670
+#, 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:1800
-#: ../libbalsa/mailbox_imap.c:1841
+#: ../libbalsa/mailbox_imap.c:1798 ../libbalsa/mailbox_imap.c:1839
 #, c-format
 msgid "Cannot get IMAP handle"
 msgstr "Ni mogoče dobiti ročice IMAP"
 
-#: ../libbalsa/mailbox_imap.c:2445
-#: ../libbalsa/mailbox_imap.c:2511
+#: ../libbalsa/mailbox_imap.c:2444 ../libbalsa/mailbox_imap.c:2510
 #, 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:2479
+#: ../libbalsa/mailbox_imap.c:2478
 #, c-format
 msgid "Downloading %u kB"
 msgstr "Prejemanje %u kB"
 
-#: ../libbalsa/mailbox_imap.c:2523
+#: ../libbalsa/mailbox_imap.c:2522
 #, c-format
 msgid "Cannot create temporary file"
 msgstr "Ni mogoče ustvariti začasne datoteke"
 
-#: ../libbalsa/mailbox_imap.c:2543
+#: ../libbalsa/mailbox_imap.c:2542
 #, c-format
 msgid "Cannot write to temporary file %s"
 msgstr "Ni mogoče pisati v začasno datoteko %s"
 
-#: ../libbalsa/mailbox_imap.c:2772
+#: ../libbalsa/mailbox_imap.c:2771 ../libbalsa/mailbox_imap.c:2890
 #, c-format
 msgid "Uploading %ld kB"
 msgstr "Pošiljanje %ld kB"
 
-#: ../libbalsa/mailbox_imap.c:2891
-msgid "Uploading %"
-msgstr "Pošiljanje %s"
-
-#: ../libbalsa/mailbox_imap.c:3194
+#: ../libbalsa/mailbox_imap.c:3192
 msgid "Server-side threading not supported."
 msgstr "Strežniško nitenje ni podprto."
 
-#: ../libbalsa/mailbox_local.c:543
-#, c-format
-msgid "Failed to save cache file \"%s\": %s."
-msgstr "Napaka med shranjevanjem datoteke predpomnilnika \"%s\": %s."
+#: ../libbalsa/mailbox_local.c:571
+#, 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:575
+#: ../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:584
+#: ../libbalsa/mailbox_local.c:614
 #, c-format
 msgid "Failed to read cache file %s: %s"
 msgstr "Branje datoteke predpomnilnika %s je spodletelo: %s."
 
-#: ../libbalsa/mailbox_local.c:602
-#: ../libbalsa/mailbox_local.c:619
-#: ../libbalsa/mailbox_local.c:643
+#: ../libbalsa/mailbox_local.c:632 ../libbalsa/mailbox_local.c:651
+#: ../libbalsa/mailbox_local.c:675
 #, 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:1169
+#: ../libbalsa/mailbox_local.c:1248
 #, c-format
 msgid "Filtering %s"
 msgstr "Filtriranje %s"
 
-#: ../libbalsa/mailbox_local.c:1257
+#: ../libbalsa/mailbox_local.c:1337
 #, c-format
 msgid "Preparing %s"
 msgstr "Pripravljanje %s"
 
-#: ../libbalsa/mailbox_local.c:2053
+#: ../libbalsa/mailbox_local.c:2133
 #, c-format
 msgid "Open of %s failed. Errno = %d, "
 msgstr "Odpiranje %s je spodletelo. Napaka Å¡t. %d, "
 
-#: ../libbalsa/mailbox_local.c:2075
-#, c-format
-msgid "Failed to sync mailbox \"%s\""
-msgstr "Napaka med usklajevanjem poštnega predala \"%s\""
+#: ../libbalsa/mailbox_local.c:2155
+#, 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:197
+#: ../libbalsa/mailbox_maildir.c:191
 #, 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:206
-#, c-format
-msgid "Could not create a MailDir directory at %s (%s)"
-msgstr "Ni mogoče ustvariti mape MailDir na %s (%s)"
+#: ../libbalsa/mailbox_maildir.c:200
+#, 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”."
 
-#: ../libbalsa/mailbox_maildir.c:214
-#: ../libbalsa/mailbox_maildir.c:223
-#: ../libbalsa/mailbox_maildir.c:234
-#, c-format
-msgid "Could not create a MailDir at %s (%s)"
-msgstr "Ni mogoče ustvariti MailDir na %s (%s)"
+#: ../libbalsa/mailbox_maildir.c:208 ../libbalsa/mailbox_maildir.c:217
+#: ../libbalsa/mailbox_maildir.c:228
+#, 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"
 
-#: ../libbalsa/mailbox_maildir.c:341
-#: ../libbalsa/mailbox_mh.c:294
+#: ../libbalsa/mailbox_maildir.c:335 ../libbalsa/mailbox_mh.c:289
 #, c-format
 msgid ""
 "Could not remove contents of %s:\n"
@@ -990,9 +1512,8 @@ msgstr ""
 "Ni mogoče odstraniti vsebine %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:347
-#: ../libbalsa/mailbox_mbox.c:326
-#: ../libbalsa/mailbox_mh.c:300
+#: ../libbalsa/mailbox_maildir.c:341 ../libbalsa/mailbox_mbox.c:314
+#: ../libbalsa/mailbox_mh.c:295
 #, c-format
 msgid ""
 "Could not remove %s:\n"
@@ -1001,527 +1522,492 @@ msgstr ""
 "Ni mogoče odstraniti %s:\n"
 "%s"
 
-#: ../libbalsa/mailbox_maildir.c:490
-#: ../libbalsa/mailbox_mbox.c:694
-#: ../libbalsa/mailbox_mh.c:528
+#: ../libbalsa/mailbox_maildir.c:484 ../libbalsa/mailbox_mbox.c:701
+#: ../libbalsa/mailbox_mh.c:522
 #, c-format
 msgid "Mailbox does not exist."
 msgstr "Poštni predal ne obstaja."
 
-#: ../libbalsa/mailbox_maildir.c:932
-#: ../libbalsa/mailbox_mbox.c:2031
-#: ../libbalsa/mailbox_mh.c:1110
+#: ../libbalsa/mailbox_maildir.c:924 ../libbalsa/mailbox_mbox.c:1985
+#: ../libbalsa/mailbox_mh.c:1102
 #, c-format
 msgid "Data copy error"
 msgstr "Napaka kopiranja podatkov"
 
-#: ../libbalsa/mailbox_mbox.c:211
-#, c-format
-msgid "Mailbox %s does not appear to be an Mbox mailbox."
-msgstr "Poštni predal %s je videti, kot da ni v obliki Mbox."
+#: ../libbalsa/mailbox_mbox.c:199
+#, 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:429
+#: ../libbalsa/mailbox_mbox.c:417
 #, c-format
 msgid "Could not write file %s: %s"
 msgstr "Ni mogoče pisati v datoteko %s: %s"
 
-#: ../libbalsa/mailbox_mbox.c:441
-#, c-format
-msgid "Failed to create temporary file \"%s\": %s"
-msgstr "Ni mogoče ustvariti začasne datoteke \"%s\": %s"
+#: ../libbalsa/mailbox_mbox.c:429
+#, 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:453
-#, c-format
-msgid "Failed to save cache file \"%s\": %s.  New version saved as \"%s\""
-msgstr "Napaka med shranjevanjem predpomnilniške datoteke \"%s\": %s.  Nova različica datoteke je bila 
shranjena kot \"%s\""
+#: ../libbalsa/mailbox_mbox.c:441
+#, 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”"
+msgstr ""
+"Napaka med shranjevanjem predpomnilniške datoteke \"%s\": %s.  Nova "
+"različica datoteke je bila shranjena kot \"%s\""
 
-#: ../libbalsa/mailbox_mbox.c:461
+#: ../libbalsa/mailbox_mbox.c:449
 #, c-format
 msgid "Could not unlink file %s: %s"
 msgstr "Ni mogoče razvezati datoteke %s: %s"
 
-#: ../libbalsa/mailbox_mbox.c:702
+#: ../libbalsa/mailbox_mbox.c:709
 #, c-format
 msgid "Cannot open mailbox."
 msgstr "Ni mogoče odpreti poštnega predala."
 
-#: ../libbalsa/mailbox_mbox.c:714
+#: ../libbalsa/mailbox_mbox.c:721
 #, c-format
 msgid "Mailbox is not in mbox format."
 msgstr "Predal ni v obliki mbox."
 
-#: ../libbalsa/mailbox_mbox.c:722
+#: ../libbalsa/mailbox_mbox.c:729
 #, c-format
 msgid "Cannot lock mailbox."
 msgstr "Ni mogoče zakleniti poštnega predala."
 
-#: ../libbalsa/mailbox_mbox.c:1988
+#: ../libbalsa/mailbox_mbox.c:1941
 #, c-format
 msgid "%s: could not open %s."
 msgstr "%s: ni mogoče odpreti %s."
 
-#: ../libbalsa/mailbox_mbox.c:1999
-#, c-format
-msgid "%s: could not get new mime stream."
-msgstr "%s: ni mogoče dobiti novega pretoka mime."
+#: ../libbalsa/mailbox_mbox.c:1953
+#, 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:2007
+#: ../libbalsa/mailbox_mbox.c:1961
 #, c-format
 msgid "%s: %s is not in mbox format."
 msgstr "%s: %s ni oblike mbox ."
 
-#: ../libbalsa/mailbox_mh.c:175
-#, c-format
-msgid "Mailbox %s does not appear to be a Mh mailbox."
-msgstr "Poštni predal %s ni videti kot pošteni predal Mh."
+#: ../libbalsa/mailbox_mh.c:170
+#, 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:185
+#: ../libbalsa/mailbox_mh.c:180
 #, c-format
 msgid "Could not create MH directory at %s (%s)"
 msgstr "Ni mogoče ustvariti mape MH %s (%s)"
 
-#: ../libbalsa/mailbox_mh.c:197
+#: ../libbalsa/mailbox_mh.c:192
 #, 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:1091
+#: ../libbalsa/mailbox_mh.c:1083
 #, c-format
 msgid "Cannot create message"
 msgstr "Ni mogoče ustvariti sporočila"
 
-#: ../libbalsa/mailbox_mh.c:1135
+#: ../libbalsa/mailbox_mh.c:1127
 #, c-format
 msgid "Message rename error"
 msgstr "Napaka preimenovanja sporočila"
 
-#: ../libbalsa/mailbox_pop3.c:192
-#, 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:341
-#, c-format
-msgid "Saving POP message to %s failed"
-msgstr "Shranjevanje sporočila POP v %s je spodletelo"
-
-#: ../libbalsa/mailbox_pop3.c:348
-#, c-format
-msgid "Retrieving Message %d of %d"
-msgstr "Pridobivanje sporočila %d od %d"
+#: ../libbalsa/mailbox_pop3.c:259
+#, 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:371
-#, c-format
-msgid "Received %ld kB of %ld"
-msgstr "Prejeto %ld kB od %ld"
+#: ../libbalsa/mailbox_pop3.c:297 ../libbalsa/mailbox_pop3.c:321
+#, 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:385
-#, c-format
-msgid "Saving POP message to %s failed."
-msgstr "Shranjevanje sporočila POP v %s je spodletelo."
+#: ../libbalsa/mailbox_pop3.c:326
+#, fuzzy, c-format
+#| msgid "Saving POP message to %s failed"
+msgid "Saving POP message failed"
+msgstr "Omejitev velikosti sporočila _POP:"
 
-#: ../libbalsa/mailbox_pop3.c:395
-#, c-format
-msgid "Transferring POP message to %s failed."
-msgstr "Prenašanje sporočila POP v %s je spodletelo."
+#: ../libbalsa/mailbox_pop3.c:345
+#, 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:477
-#, c-format
-msgid ""
-"POP3 mailbox %s temp file error:\n"
-"%s"
-msgstr ""
-"POP3 poštni predal %s napaka začasne datoteke:\n"
-"%s"
+#: ../libbalsa/mailbox_pop3.c:380
+#, 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:502
+#: ../libbalsa/mailbox_pop3.c:437
 #, c-format
-msgid "POP3 mailbox %s error: %s\n"
-msgstr "POP3 poštni predal %s napaka: %s\n"
+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:540
-#, c-format
-msgid "POP3 message %d oversized: %d kB - skipped."
+#: ../libbalsa/mailbox_pop3.c:495 ../libbalsa/send.c:787
+#, 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«"
+
+#: ../libbalsa/mailbox_pop3.c:509
+#, 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
+#, fuzzy, c-format
+#| msgid "POP3 mailbox %s error: %s\n"
+msgid "POP3 mailbox %s error: %s"
+msgstr "Strežnik POP3 %s"
+
+#: ../libbalsa/mailbox_pop3.c:562
+#, 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:552
-#, c-format
-msgid "POP3 error: cannot open %s for writing."
-msgstr "Napaka POP3: %s ni mogoče odpreti za pisanje."
-
-#: ../libbalsa/mailbox_pop3.c:560
-#, c-format
-msgid "POP3 error: cannot close %s."
-msgstr "Napaka POP3: ni mogoče zapreti %s."
-
-#: ../libbalsa/mailbox_pop3.c:595
-#, c-format
-msgid "POP3 error: %s."
-msgstr "Napaka POP3: %s"
-
-#: ../libbalsa/message.c:617
-#, c-format
-msgid "Mailbox (%s) is readonly: cannot change flags."
-msgstr "Poštni predal (%s) je odprt le za branje: ni mogoče spremeniti zastavice."
-
-#: ../libbalsa/misc.c:598
-msgid "west european"
-msgstr "zahodno evropska"
-
-#: ../libbalsa/misc.c:600
-#: ../libbalsa/misc.c:634
-msgid "east european"
-msgstr "vzhodno evropska"
-
-#: ../libbalsa/misc.c:602
-msgid "south european"
-msgstr "južno evropska"
-
-#: ../libbalsa/misc.c:604
-msgid "north european"
-msgstr "severno evropska"
-
-#: ../libbalsa/misc.c:606
-#: ../libbalsa/misc.c:636
-msgid "cyrillic"
-msgstr "cirilica"
-
-#: ../libbalsa/misc.c:608
-#: ../libbalsa/misc.c:642
-msgid "arabic"
-msgstr "arabščina"
-
-#: ../libbalsa/misc.c:610
-#: ../libbalsa/misc.c:638
-msgid "greek"
-msgstr "grščina"
-
-#: ../libbalsa/misc.c:612
-#: ../libbalsa/misc.c:640
-msgid "hebrew"
-msgstr "hebrejščina"
-
-#: ../libbalsa/misc.c:614
-msgid "turkish"
-msgstr "turščina"
-
-#: ../libbalsa/misc.c:616
-msgid "nordic"
-msgstr "nordijska"
-
-#: ../libbalsa/misc.c:618
-msgid "thai"
-msgstr "tajska"
-
-#: ../libbalsa/misc.c:620
-#: ../libbalsa/misc.c:644
-msgid "baltic"
-msgstr "baltska"
+#: ../libbalsa/mailbox_pop3.c:640
+msgid "Connected"
+msgstr "Povezano"
+
+#: ../libbalsa/mailbox_pop3.c:654
+#, 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 "Deleting messages on server…"
+msgstr "Brisanje sporočilc s strežnika ..."
+
+#: ../libbalsa/mailbox_pop3.c:687
+#, fuzzy, c-format
+#| msgid "POP3 error: %s."
+msgid "POP3 error: %s"
+msgstr "Strežnik POP3 %s"
+
+#. done - clean up
+#: ../libbalsa/mailbox_pop3.c:694 ../libbalsa/send.c:1085
+#, c-format
+msgid "Finished"
+msgstr "Končano"
+
+#: ../libbalsa/message.c:618
+#, 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"
+msgid "West European"
+msgstr "Zahodnoevropski (HP)"
+
+#: ../libbalsa/misc.c:397 ../libbalsa/misc.c:431
+#, fuzzy
+#| msgid "east european"
+msgid "East European"
+msgstr "Vzhod"
+
+#: ../libbalsa/misc.c:399
+msgid "South European"
+msgstr "Južnoevropski"
+
+#: ../libbalsa/misc.c:401
+msgid "North European"
+msgstr "severnoevropsko"
+
+#: ../libbalsa/misc.c:403 ../libbalsa/misc.c:433
+msgid "Cyrillic"
+msgstr "Cirilica"
+
+#: ../libbalsa/misc.c:405 ../libbalsa/misc.c:439
+msgid "Arabic"
+msgstr "Arabski"
+
+#: ../libbalsa/misc.c:407 ../libbalsa/misc.c:435
+msgid "Greek"
+msgstr "Grški"
+
+#: ../libbalsa/misc.c:409 ../libbalsa/misc.c:437
+msgid "Hebrew"
+msgstr "Hebrejski"
+
+#: ../libbalsa/misc.c:411
+msgid "Turkish"
+msgstr "Turški"
+
+#: ../libbalsa/misc.c:413
+msgid "Nordic"
+msgstr "Nordijski"
+
+#: ../libbalsa/misc.c:415
+msgid "Thai"
+msgstr "Tajski"
+
+#: ../libbalsa/misc.c:417 ../libbalsa/misc.c:441
+msgid "Baltic"
+msgstr "Baltski"
+
+#: ../libbalsa/misc.c:419
+msgid "Celtic"
+msgstr "Keltski"
+
+#: ../libbalsa/misc.c:421
+#, fuzzy
+#| msgid "west europe (euro)"
+msgid "West European (euro)"
+msgstr "Zahodnoevropski (DEC)"
+
+#: ../libbalsa/misc.c:423
+msgid "Russian"
+msgstr "ruski"
+
+#: ../libbalsa/misc.c:425
+msgid "Ukrainian"
+msgstr "Ukrajinsko"
+
+#: ../libbalsa/misc.c:427
+msgid "Japanese"
+msgstr "Japonski"
+
+#: ../libbalsa/misc.c:429
+msgid "Korean"
+msgstr "Korejski"
 
 #: ../libbalsa/misc.c:622
-msgid "celtic"
-msgstr "keltska"
-
-#: ../libbalsa/misc.c:624
-msgid "west europe (euro)"
-msgstr "zahodno evropska"
-
-#: ../libbalsa/misc.c:626
-msgid "russian"
-msgstr "rusko"
-
-#: ../libbalsa/misc.c:628
-msgid "ukrainian"
-msgstr "ukrajinsko"
-
-#: ../libbalsa/misc.c:630
-msgid "japanese"
-msgstr "japonščina"
-
-#: ../libbalsa/misc.c:632
-msgid "korean"
-msgstr "korejščina"
-
-#: ../libbalsa/misc.c:806
 #, c-format
 msgid "Cannot open %s: %s"
 msgstr "Ni mogoče odpreti %s: %s"
 
-#: ../libbalsa/misc.c:815
+#: ../libbalsa/misc.c:631
 #, c-format
 msgid "Cannot open %s: is a symbolic link"
 msgstr "Ni mogoče odpreti %s: datoteka je simbolna povezava"
 
-#: ../libbalsa/misc.c:942
+#: ../libbalsa/misc.c:758
 msgid "Timeout exceeded while attempting fcntl lock!"
 msgstr "Zakasnitev je bila presežena med poskusom zaklepanja fcntl !"
 
-#: ../libbalsa/misc.c:949
-#, c-format
-msgid "Waiting for fcntl lock... %d"
-msgstr "ÄŒakanje na zaklep fcntl ... %d"
+#: ../libbalsa/misc.c:765
+#, 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:977
+#: ../libbalsa/misc.c:793
 msgid "Timeout exceeded while attempting flock lock!"
 msgstr "Zakasnitev med poskusom zaklepanja flock!"
 
-#: ../libbalsa/misc.c:984
-#, c-format
-msgid "Waiting for flock attempt... %d"
-msgstr "ÄŒakanje na poskus zaklepa flock ... %d"
+#: ../libbalsa/misc.c:800
+#, fuzzy, c-format
+#| msgid "Waiting for flock attempt... %d"
+msgid "Waiting for flock attempt… %d"
+msgstr "Ponovno prejemanje (poskus %d/%d) ..."
 
-#: ../libbalsa/misc.c:1265
+#: ../libbalsa/misc.c:1077
 #, c-format
 msgid "LDAP Directory for %s"
 msgstr "Mapa LDAP za %s"
 
-#: ../libbalsa/rfc2445.c:90
-#: ../libbalsa/rfc2445.c:685
-#: ../libbalsa/rfc2445.c:704
-#: ../libbalsa/rfc3156.c:1394
+#: ../libbalsa/rfc2445.c:88 ../libbalsa/rfc2445.c:697 ../libbalsa/rfc2445.c:716
+#: ../libbalsa/rfc3156.c:683
 msgid "unknown"
 msgstr "neznan"
 
-#: ../libbalsa/rfc2445.c:91
+#: ../libbalsa/rfc2445.c:89
 msgid "needs action"
 msgstr "zahteva dejanje"
 
-#: ../libbalsa/rfc2445.c:92
+#: ../libbalsa/rfc2445.c:90
 msgid "accepted"
 msgstr "sprejeto"
 
-#: ../libbalsa/rfc2445.c:93
+#: ../libbalsa/rfc2445.c:91
 msgid "declined"
 msgstr "odklonjeno"
 
-#: ../libbalsa/rfc2445.c:94
+#: ../libbalsa/rfc2445.c:92
 msgid "tentatively accepted"
 msgstr "poskusno sprejeto"
 
-#: ../libbalsa/rfc2445.c:95
+#: ../libbalsa/rfc2445.c:93
 msgid "delegated"
 msgstr "pooblaščeno"
 
-#: ../libbalsa/rfc2445.c:96
+#: ../libbalsa/rfc2445.c:94
 msgid "completed"
 msgstr "končano"
 
-#: ../libbalsa/rfc2445.c:97
+#: ../libbalsa/rfc2445.c:95
 msgid "in process"
 msgstr "v obdelavi"
 
-#: ../libbalsa/rfc2445.c:686
+#: ../libbalsa/rfc2445.c:698
 msgid "Event Notification"
 msgstr "Obvestilo dogodka"
 
-#: ../libbalsa/rfc2445.c:687
+#: ../libbalsa/rfc2445.c:699
 msgid "Event Request"
 msgstr "Zahteva dogodka"
 
-#: ../libbalsa/rfc2445.c:688
+#: ../libbalsa/rfc2445.c:700
 msgid "Reply to Event Request"
 msgstr "Odgovori na zahtevo dogodka"
 
-#: ../libbalsa/rfc2445.c:689
+#: ../libbalsa/rfc2445.c:701
 msgid "Event Cancellation"
 msgstr "Preklic dogodka"
 
-#: ../libbalsa/rfc2445.c:705
+#: ../libbalsa/rfc2445.c:717
 msgid "chair"
 msgstr "predsednik"
 
-#: ../libbalsa/rfc2445.c:706
+#: ../libbalsa/rfc2445.c:718
 msgid "required participant"
 msgstr "zahtevani udeleženi"
 
-#: ../libbalsa/rfc2445.c:707
+#: ../libbalsa/rfc2445.c:719
 msgid "optional participant"
 msgstr "izbirni udeleženci"
 
-#: ../libbalsa/rfc2445.c:708
+#: ../libbalsa/rfc2445.c:720
 msgid "non-participant, information only"
 msgstr "ne-udeleženci, le podatki"
 
-#: ../libbalsa/rfc3156.c:95
-#, c-format
-msgid "Gpgme has been compiled without support for protocol %s."
-msgstr "Gpgme je bil preveden brez podpore za protokol %s."
-
-#: ../libbalsa/rfc3156.c:100
-#, c-format
-msgid "Crypto engine %s is not installed properly."
-msgstr "Šifrirni programnik %s ni pravilno nameščen."
-
-#: ../libbalsa/rfc3156.c:104
-#, c-format
-msgid " Hint: check the `gnupg2' (preferred) or `gnupg' package."
-msgstr " Namig: preverite paket `gpgsm' (prednostno) ali `gnupg'."
-
-#: ../libbalsa/rfc3156.c:107
-#, c-format
-msgid " Hint: check the `gpgsm' package."
-msgstr " Namig: preverite paket `gpgsm'."
-
-#: ../libbalsa/rfc3156.c:111
-#, c-format
-msgid "Crypto engine %s version %s is installed, but at least version %s is required."
-msgstr "Šifrirni programnik %s, različice %s. je nameščen, toda za delovanje mora biti naložena vsaj 
različica %s."
-
-#: ../libbalsa/rfc3156.c:118
-#, c-format
-msgid "Unknown problem with engine for protocol %s."
-msgstr "Neznana težava s programnikom za protokol %s."
-
-#: ../libbalsa/rfc3156.c:123
-#, c-format
-msgid "%s: could not retrieve crypto engine information: %s."
-msgstr "%s: ni mogoče pridobiti podrobnosti šifrirnega programnika: %s."
-
-#: ../libbalsa/rfc3156.c:127
-#, c-format
-msgid ""
-"\n"
-"Disable support for protocol %s."
-msgstr ""
-"\n"
-"Onemogoči podporo protokola %s."
-
-#: ../libbalsa/rfc3156.c:355
-#: ../libbalsa/rfc3156.c:864
-msgid "Enter passphrase to unlock the secret key for signing"
-msgstr "Vnesite šifrirno frazo za odklepanje skritega ključa za podpisovanje"
-
-#: ../libbalsa/rfc3156.c:603
-#: ../libbalsa/rfc3156.c:608
-#: ../libbalsa/rfc3156.c:725
-#: ../libbalsa/rfc3156.c:730
-#: ../libbalsa/rfc3156.c:940
-#: ../libbalsa/rfc3156.c:945
-#: ../libbalsa/rfc3156.c:1034
-#: ../libbalsa/rfc3156.c:1039
-msgid "creating a gpgme context failed"
-msgstr "ustvarjanje vsebine gpgme je spodletelo"
-
-#: ../libbalsa/rfc3156.c:744
-#: ../libbalsa/rfc3156.c:1052
-msgid "Enter passphrase to decrypt message"
-msgstr "Vnesite geslo za dešifriranje sporočila"
-
-#: ../libbalsa/rfc3156.c:1061
-#: ../libbalsa/rfc3156.c:1068
+#: ../libbalsa/rfc3156.c:589 ../libbalsa/rfc3156.c:596
 msgid "decryption and signature verification failed"
 msgstr "dešifriranje in podpisovanje ni uspelo"
 
-#: ../libbalsa/rfc3156.c:1103
+#: ../libbalsa/rfc3156.c:622
 msgid "The signature is valid."
 msgstr "Podpis je veljaven."
 
-#: ../libbalsa/rfc3156.c:1105
+#: ../libbalsa/rfc3156.c:624
 msgid "The signature is valid but expired."
 msgstr "Podpis je veljaven, toda potekel."
 
-#: ../libbalsa/rfc3156.c:1108
-msgid "The signature is valid but the key used to verify the signature has expired."
+#: ../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/rfc3156.c:1111
-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/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/rfc3156.c:1114
+#: ../libbalsa/rfc3156.c:633
 msgid "The signature is invalid."
 msgstr "Podpis je neveljaven."
 
-#: ../libbalsa/rfc3156.c:1117
+#: ../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/rfc3156.c:1119
+#: ../libbalsa/rfc3156.c:638
 msgid "This part is not a real PGP signature."
 msgstr "Ta del ni pravi podpis PGP."
 
-#: ../libbalsa/rfc3156.c:1122
+#: ../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."
+msgstr ""
+"Podpisa ni mogoče preveriti zaradi neveljavnega šifrirnega programnika."
 
-#: ../libbalsa/rfc3156.c:1125
-#: ../libbalsa/rfc3156.c:1891
+#: ../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/rfc3156.c:1128
+#: ../libbalsa/rfc3156.c:650
 msgid "An error prevented the signature verification."
 msgstr "Napaka je preprečila preverjanje podpisa."
 
-#: ../libbalsa/rfc3156.c:1136
+#: ../libbalsa/rfc3156.c:661
 msgid "The user ID is of unknown validity."
 msgstr "Veljavnost uporabnikovega ID ni znana."
 
-#: ../libbalsa/rfc3156.c:1138
+#: ../libbalsa/rfc3156.c:663
 msgid "The validity of the user ID is undefined."
 msgstr "Veljavnost uporabnikovega ID je nedoločena."
 
-#: ../libbalsa/rfc3156.c:1140
+#: ../libbalsa/rfc3156.c:665
 msgid "The user ID is never valid."
 msgstr "Uporabniški ID ni nikoli veljaven."
 
-#: ../libbalsa/rfc3156.c:1142
+#: ../libbalsa/rfc3156.c:667
 msgid "The user ID is marginally valid."
 msgstr "Uporabniški ID je delno veljaven."
 
-#: ../libbalsa/rfc3156.c:1144
+#: ../libbalsa/rfc3156.c:669
 msgid "The user ID is fully valid."
 msgstr "Uporabniški ID je polno veljaven."
 
-#: ../libbalsa/rfc3156.c:1146
+#: ../libbalsa/rfc3156.c:671
 msgid "The user ID is ultimately valid."
 msgstr "Uporabniški ID je popolno veljaven."
 
-#: ../libbalsa/rfc3156.c:1148
-#: ../libbalsa/rfc3156.c:1406
+#: ../libbalsa/rfc3156.c:673 ../libbalsa/rfc3156.c:695
 msgid "bad validity"
 msgstr "slaba veljavnost"
 
-#: ../libbalsa/rfc3156.c:1156
+#: ../libbalsa/rfc3156.c:685
+msgid "undefined"
+msgstr "nedoločeno"
+
+#: ../libbalsa/rfc3156.c:689
+msgid "marginal"
+msgstr "delno"
+
+#: ../libbalsa/rfc3156.c:691
+msgid "full"
+msgstr "polno"
+
+#: ../libbalsa/rfc3156.c:693
+msgid "ultimate"
+msgstr "popolno"
+
+#: ../libbalsa/rfc3156.c:705
 msgid "PGP signature: "
 msgstr "Podpis PGP: "
 
-#: ../libbalsa/rfc3156.c:1158
+#: ../libbalsa/rfc3156.c:707
 msgid "S/MIME signature: "
 msgstr "Podpis S/MIME: "
 
-#: ../libbalsa/rfc3156.c:1160
+#: ../libbalsa/rfc3156.c:709
 msgid "(unknown protocol) "
 msgstr "(neznan protokol)"
 
-#: ../libbalsa/rfc3156.c:1187
+#: ../libbalsa/rfc3156.c:737
 #, c-format
 msgid ""
 "\n"
-"User ID: %s"
+"Signature validity: %s"
 msgstr ""
 "\n"
-"ID uporabnika: %s"
+"Veljavnost podpisa: %s"
 
-#: ../libbalsa/rfc3156.c:1190
-#, c-format
-msgid ""
-"\n"
-"Signed by: %s"
-msgstr ""
-"\n"
-"Podpisnik: %s"
-
-#: ../libbalsa/rfc3156.c:1194
-#, c-format
-msgid ""
-"\n"
-"Mail address: %s"
-msgstr ""
-"\n"
-"Poštni naslov: %s"
-
-#: ../libbalsa/rfc3156.c:1196
+#: ../libbalsa/rfc3156.c:738
 #, c-format
 msgid ""
 "\n"
@@ -1530,16 +2016,16 @@ msgstr ""
 "\n"
 "Podpisano ob: %s"
 
-#: ../libbalsa/rfc3156.c:1197
+#: ../libbalsa/rfc3156.c:740
 #, c-format
 msgid ""
 "\n"
-"User ID validity: %s"
+"Key fingerprint: %s"
 msgstr ""
 "\n"
-"Veljavnost uporabniškega ID: %s"
+"Prstni odtis ključa: %s"
 
-#: ../libbalsa/rfc3156.c:1201
+#: ../libbalsa/rfc3156.c:765
 #, c-format
 msgid ""
 "\n"
@@ -1548,17 +2034,33 @@ msgstr ""
 "\n"
 "Zaupanje lastniku ključa: %s"
 
-#: ../libbalsa/rfc3156.c:1205
-#, c-format
+#: ../libbalsa/rfc3156.c:774
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "User ID's:"
 msgid ""
 "\n"
-"Key fingerprint: %s"
+"User IDs:"
+msgstr "Krajevni ID za ta stik ni zapisljiv."
+
+#: ../libbalsa/rfc3156.c:777
+msgid ""
+"\n"
+"User ID:"
 msgstr ""
 "\n"
-"Prstni odtis ključa: %s"
+"ID uporabnika:"
 
-#. Subkey creation date
-#: ../libbalsa/rfc3156.c:1208
+#: ../libbalsa/rfc3156.c:788
+msgid " [Revoked]"
+msgstr "[Preklicano]"
+
+#: ../libbalsa/rfc3156.c:790
+msgid " [Invalid]"
+msgstr "[Neveljavno]"
+
+#: ../libbalsa/rfc3156.c:817
 #, c-format
 msgid ""
 "\n"
@@ -1567,8 +2069,7 @@ msgstr ""
 "\n"
 "Podključ je bil ustvarjen ob: %s"
 
-#. Subkey expiration date
-#: ../libbalsa/rfc3156.c:1210
+#: ../libbalsa/rfc3156.c:819
 #, c-format
 msgid ""
 "\n"
@@ -1577,25 +2078,25 @@ msgstr ""
 "\n"
 "Podključ poteče ob: %s"
 
-#: ../libbalsa/rfc3156.c:1218
+#: ../libbalsa/rfc3156.c:828
 msgid " revoked"
 msgstr " preklicano"
 
-#: ../libbalsa/rfc3156.c:1223
+#: ../libbalsa/rfc3156.c:833
 msgid " expired"
 msgstr " pretečeno"
 
-#: ../libbalsa/rfc3156.c:1228
+#: ../libbalsa/rfc3156.c:838
 msgid " disabled"
 msgstr " onemogočeno"
 
-#: ../libbalsa/rfc3156.c:1233
+#: ../libbalsa/rfc3156.c:843
 msgid " invalid"
 msgstr " neveljavno"
 
-#. ngettext: string begins with a single space, so no space after
-#. * the colon is correct punctuation (in English).
-#: ../libbalsa/rfc3156.c:1237
+#. ngettext: string begins with a single space, so no space
+#. * after the colon is correct punctuation (in English).
+#: ../libbalsa/rfc3156.c:847
 #, c-format
 msgid ""
 "\n"
@@ -1616,7 +2117,7 @@ msgstr[3] ""
 "\n"
 "Atributi podključa:%s"
 
-#: ../libbalsa/rfc3156.c:1246
+#: ../libbalsa/rfc3156.c:859
 #, c-format
 msgid ""
 "\n"
@@ -1625,7 +2126,7 @@ msgstr ""
 "\n"
 "Ime izdajatelja: %s"
 
-#: ../libbalsa/rfc3156.c:1250
+#: ../libbalsa/rfc3156.c:863
 #, c-format
 msgid ""
 "\n"
@@ -1634,7 +2135,7 @@ msgstr ""
 "\n"
 "Zaporedna Å¡tevilka izdajatelja: %s"
 
-#: ../libbalsa/rfc3156.c:1253
+#: ../libbalsa/rfc3156.c:866
 #, c-format
 msgid ""
 "\n"
@@ -1643,224 +2144,126 @@ msgstr ""
 "\n"
 "ID verige: %s"
 
-#: ../libbalsa/rfc3156.c:1310
-#, c-format
-msgid "Could not launch %s to query the public key %s."
-msgstr "Ni mogoče zagnati %s za poizvedbo javnega ključa %s."
+#: ../libbalsa/rfc3156.c:895
+msgid "Try again later."
+msgstr "Poskusite znova kasneje."
 
-#: ../libbalsa/rfc3156.c:1360
+#: ../libbalsa/rfc6350.c:62
 #, c-format
-msgid ""
-"Running %s failed with return value %d:\n"
-"%s"
+msgid "malformed card, BEGIN:VCARD expected"
 msgstr ""
-"Zaganjanje %s je spodletelo z vrednostjo %d:\n"
-"%s"
 
-#: ../libbalsa/rfc3156.c:1367
+#: ../libbalsa/rfc6350.c:100
 #, c-format
-msgid ""
-"Running %s successful:\n"
-"%s"
+msgid "malformed card, END:VCARD missing"
 msgstr ""
-"Zaganjanje %s je bilo uspešno:\n"
-"%s"
-
-#: ../libbalsa/rfc3156.c:1396
-msgid "undefined"
-msgstr "nedoločeno"
-
-#: ../libbalsa/rfc3156.c:1398
-#: ../src/address-book-config.c:200
-msgid "never"
-msgstr "nikoli"
 
-#: ../libbalsa/rfc3156.c:1400
-msgid "marginal"
-msgstr "delno"
-
-#: ../libbalsa/rfc3156.c:1402
-msgid "full"
-msgstr "polno"
-
-#: ../libbalsa/rfc3156.c:1404
-msgid "ultimate"
-msgstr "popolno"
-
-#: ../libbalsa/rfc3156.c:1467
-msgid "User ID"
-msgstr "ID uporabnika"
-
-#: ../libbalsa/rfc3156.c:1467
-msgid "Key ID"
-msgstr "ID Ključa"
-
-#: ../libbalsa/rfc3156.c:1467
-msgid "Length"
-msgstr "Dolžina"
-
-#: ../libbalsa/rfc3156.c:1467
-msgid "Validity"
-msgstr "Veljavnost"
+#: ../libbalsa/rfc6350.c:259
+#, fuzzy, c-format
+msgid "malformed line “%s”, missing “:”"
+msgstr "Izmaličena vrstica stanja"
 
-#. FIXME: create dialog according to the Gnome HIG
-#: ../libbalsa/rfc3156.c:1511
-msgid "Select key"
-msgstr "Izberi ključ"
-
-#: ../libbalsa/rfc3156.c:1527
+#: ../libbalsa/rfc6350.c:270
 #, c-format
-msgid "Select the private key for the signer %s"
-msgstr "Izberite osebni ključ za podpisnika %s"
+msgid "malformed line “%s”, empty name or value"
+msgstr ""
 
-#: ../libbalsa/rfc3156.c:1531
+#: ../libbalsa/send.c:206
 #, c-format
-msgid "Select the public key for the recipient %s"
-msgstr "Izberite javni ključ za prejemnika %s"
+msgid "SMTP server %s"
+msgstr "Strežnik SMTP %s"
 
-#: ../libbalsa/rfc3156.c:1662
-#, c-format
-msgid "Insufficient trust for recipient %s"
-msgstr "Nezadostno zaupanje prejemniku %s"
+#: ../libbalsa/send.c:627
+#, fuzzy, c-format
+#| msgid "Page %d of %d"
+msgid "Message %u of %u"
+msgstr "%u od %u"
 
-#: ../libbalsa/rfc3156.c:1664
+#: ../libbalsa/send.c:650
 #, c-format
-msgid "The validity of the key with user ID \"%s\" is \"%s\"."
-msgstr "Veljavnost ključa z uporabniškim ID \"%s\" je \"%s\"."
-
-#: ../libbalsa/rfc3156.c:1675
-msgid "Use this key anyway?"
-msgstr "Ali naj želite vseeno uporabiti ključ?"
-
-#: ../libbalsa/rfc3156.c:1892
-msgid "Try again later."
-msgstr "Poskusite znova kasneje."
+msgid "Cannot reach SMTP server %s (%s), any queued message will remain in %s."
+msgstr ""
 
-#: ../libbalsa/send.c:253
-#: ../libbalsa/send.c:260
-msgid "Sending Mail..."
-msgstr "Pošiljanje pošte ..."
+#: ../libbalsa/send.c:840
+#, fuzzy
+#| msgid "Sending Mail..."
+msgid "Sending Mail"
+msgstr "Prišlo je do napake med pošiljanjem sporočila. Sporočilo ni poslano."
 
-#: ../libbalsa/send.c:256
-#: ../src/main-window.c:2823
-msgid "_Hide"
-msgstr "_Skrij"
-
-#: ../libbalsa/send.c:951
-#, c-format
-msgid ""
-"Could not send the message to %s:\n"
-"%d: %s\n"
-"Message left in your outbox.\n"
-msgstr ""
-"Sporočila ni mogoče poslati na %s:\n"
-"%d: %s\n"
-"Sporočilo je ostalo v odhodnem predalu.\n"
+#: ../libbalsa/send.c:946
+#, fuzzy, c-format
+#| msgid "Save this message and close"
+msgid "Save message in %s…"
+msgstr "Ni mogoče shraniti sporočila."
 
-#: ../libbalsa/send.c:997
+#: ../libbalsa/send.c:954
 #, c-format
 msgid "Saving sent message to %s failed: %s"
 msgstr "Shranjevanje poslanega sporočila v %s ni uspelo: %s"
 
-#: ../libbalsa/send.c:1027
-#: ../libbalsa/send.c:1039
-#, c-format
+#: ../libbalsa/send.c:985
+#, fuzzy, c-format
+#| msgid ""
+#| "Relaying refused:\n"
+#| "%d: %s\n"
+#| "Message left in your outbox.\n"
 msgid ""
-"Relaying refused:\n"
-"%d: %s\n"
-"Message left in your outbox.\n"
+"Sending message failed: %s\n"
+"Message left in your outbox."
 msgstr ""
 "Rele je bil zavrnjen:\n"
 "%d: %s\n"
 "Sporočilo je ostalo v odhodnem predalu.\n"
 
-#: ../libbalsa/send.c:1046
-msgid ""
-"Message submission problem, placing it into your outbox.\n"
-"System will attempt to resubmit the message until you delete it."
-msgstr ""
-"Težava z objavo sporočila, postavljanje v odhodni predal.\n"
-"Sistem bo poskušal znova objaviti sporočilo, dokler ga ne izbrišete."
-
-#: ../libbalsa/send.c:1076
-msgid "Connected to MTA"
-msgstr "Povezan z MTA"
-
-#. status code, mailbox
-#: ../libbalsa/send.c:1085
-#, c-format
-msgid "From: %d <%s>"
-msgstr "Od: %d <%s>"
-
-#. mailbox, status code, status text
-#: ../libbalsa/send.c:1089
-#, c-format
-msgid "From %s: %d %s"
-msgstr "Od %s: %d %s"
-
-#. status code, mailbox
-#: ../libbalsa/send.c:1100
-#, c-format
-msgid "To: %d <%s>"
-msgstr "Za: %d <%s>"
-
-#. mailbox, status code, status text
-#: ../libbalsa/send.c:1104
-#, c-format
-msgid "To %s: %d %s"
-msgstr "Za %s: %d %s"
-
-#: ../libbalsa/send.c:1142
-msgid "Disconnected"
-msgstr "Povezava je bila prekinjena"
-
-#: ../libbalsa/send.c:1424
-msgid ""
-"SMTP server refused connection.\n"
-"Check your internet connection."
-msgstr ""
-"Strežnik SMTP je zavrnil povezavo.\n"
-"Preverite medmrežno povezavo."
-
-#: ../libbalsa/send.c:1429
-msgid ""
-"SMTP server cannot be reached.\n"
-"Check your internet connection."
-msgstr ""
-"Strežnik SMTP ni dostopen.\n"
-"Preverite medmrežno povezavo."
-
-#: ../libbalsa/send.c:1438
-msgid "Message left in Outbox (try again later)"
-msgstr "Sporočilo je ostalo v odhodnem predalu (poskusite znova kasneje)"
-
-#: ../libbalsa/send.c:1442
-#, c-format
-msgid ""
-"SMTP server problem (%d): %s\n"
-"Message is left in outbox."
-msgstr ""
-"Težava strežnika SMTP (%d): %s\n"
-"Sporočilo je ostalo v odhodnem predalu."
-
-#: ../libbalsa/send.c:1756
-#: ../libbalsa/send.c:1825
+#: ../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
+#, 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
+#, fuzzy, c-format
+#| msgid "Forward message to %s: %s"
+msgid "Transmitted %u message to %s"
+msgid_plural "Transmitted %u messages to %s"
+msgstr[0] "Posreduj sporočilo osebi %s: %s"
+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
 #, c-format
 msgid "Cannot read %s: %s"
 msgstr "Ni mogoče prebrati %s: %s"
 
-#: ../libbalsa/send.c:1759
-#: ../libbalsa/send.c:1828
+#: ../libbalsa/send.c:1266 ../libbalsa/send.c:1332
 #, c-format
 msgid "Cannot read %s"
 msgstr "Ni mogoče prebrati %s"
 
-#: ../libbalsa/send.c:1789
-#, c-format
-msgid "Cannot determine charset for text file `%s'; sending as mime type `%s'"
-msgstr "Ni mogoče določiti nabora znakov za datoteko `%s'; pošiljanje kot mime vrsta `%s'"
+#: ../libbalsa/send.c:1296
+#, fuzzy, c-format
+#| msgid ""
+#| "Cannot determine charset for text file `%s'; sending as mime type `%s'"
+msgid ""
+"Cannot determine character set for text file “%s”; sending as MIME type “%s”"
+msgstr ""
+"Ni mogoče določiti nabora znakov za datoteko `%s'; pošiljanje kot mime vrsta "
+"`%s'"
 
-#: ../libbalsa/send.c:2141
+#: ../libbalsa/send.c:1731
 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:."
@@ -1868,186 +2271,181 @@ 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:2229
+#: ../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:."
 
 #. host, authentication method
-#: ../libbalsa/server.c:431
+#: ../libbalsa/server.c:537
 #, c-format
 msgid "Logging in to %s using %s"
 msgstr "Prijavljanje v %s z %s"
 
-#: ../libbalsa/smtp-server.c:388
-#: ../src/mailbox-conf.c:205
-#: ../src/mailbox-conf.c:1494
-#: ../src/pref-manager.c:404
-#: ../src/pref-manager.c:3426
-msgid "Never"
-msgstr "Nikoli"
+#: ../libbalsa/smtp-server.c:298
+#, fuzzy
+msgid "SMTP over SSL (SMTPS)"
+msgstr "SMTP preko SSL"
 
-#: ../libbalsa/smtp-server.c:389
-#: ../src/mailbox-conf.c:206
-#: ../src/mailbox-conf.c:1495
-msgid "If Possible"
-msgstr "Če je mogoče"
+#: ../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/smtp-server.c:390
-#: ../src/mailbox-conf.c:207
-msgid "Required"
-msgstr "Zahtevano"
+#: ../libbalsa/smtp-server.c:300 ../libinit_balsa/assistant_page_user.c:70
+#: ../src/mailbox-conf.c:1296
+#, fuzzy
+msgid "TLS if possible (not recommended)"
+msgstr "TLS"
 
-#: ../libbalsa/smtp-server.c:423
+#: ../libbalsa/smtp-server.c:301 ../libinit_balsa/assistant_page_user.c:71
+#: ../src/mailbox-conf.c:1297
+#, fuzzy
+msgid "None (not recommended)"
+msgstr "_Brez"
+
+#: ../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/smtp-server.c:538
+#: ../libbalsa/smtp-server.c:467
 msgid "SMTP Server"
 msgstr "Strežnik SMTP"
 
-#: ../libbalsa/smtp-server.c:565
+#: ../libbalsa/smtp-server.c:497 ../src/folder-conf.c:336
+#: ../src/mailbox-conf.c:1278 ../src/mailbox-conf.c:1391
+msgid "_Basic"
+msgstr "_Osnovno"
+
+#: ../libbalsa/smtp-server.c:502
 msgid "_Descriptive Name:"
 msgstr "Opisno _ime:"
 
 #. pop server
 #. imap server
-#: ../libbalsa/smtp-server.c:572
-#: ../src/folder-conf.c:377
-#: ../src/mailbox-conf.c:1226
-#: ../src/mailbox-conf.c:1339
+#: ../libbalsa/smtp-server.c:510 ../src/folder-conf.c:384
+#: ../src/mailbox-conf.c:1285 ../src/mailbox-conf.c:1400
 msgid "_Server:"
 msgstr "_Strežnik:"
 
-#: ../libbalsa/smtp-server.c:579
+#. security
+#: ../libbalsa/smtp-server.c:518 ../src/mailbox-conf.c:1290
+#, fuzzy
+#| msgid "Security"
+msgid "Se_curity:"
+msgstr "Std. nap."
+
+#. authentication or anonymous access
+#: ../libbalsa/smtp-server.c:522
+msgid "Server requires authentication"
+msgstr "Strežnik zahteva overitev"
+
+#: ../libbalsa/smtp-server.c:523
+msgid "_Authentication:"
+msgstr "_Overitev:"
+
+#: ../libbalsa/smtp-server.c:529
 msgid "_User Name:"
 msgstr "_Uporabniško ime:"
 
-#: ../libbalsa/smtp-server.c:586
+#: ../libbalsa/smtp-server.c:536
 msgid "_Pass Phrase:"
 msgstr "_Å ifrirno geslo:"
 
-#: ../libbalsa/smtp-server.c:595
-#: ../src/mailbox-conf.c:237
-msgid "Use _TLS:"
-msgstr "Uporabi _TLS:"
+#: ../libbalsa/smtp-server.c:549 ../src/folder-conf.c:374
+#: ../src/mailbox-conf.c:1329 ../src/mailbox-conf.c:1456
+msgid "_Advanced"
+msgstr "_Napredno"
 
-#: ../libbalsa/smtp-server.c:600
-msgid "C_ertificate Pass Phrase:"
-msgstr "_Å ifrirno geslo potrdila"
+#. client certificate and passphrase
+#. client certificate configuration
+#: ../libbalsa/smtp-server.c:552 ../src/mailbox-conf.c:264
+#, fuzzy
+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
+#, fuzzy
+msgid "Choose Client Certificate"
+msgstr "Potrdilo odjemalca X.509"
+
+#: ../libbalsa/smtp-server.c:559 ../src/mailbox-conf.c:266
+#, fuzzy
+#| msgid "C_ertificate Pass Phrase:"
+msgid "Certificate _File:"
+msgstr ""
+"To datoteko potrdila X.509 (oblika PEM) se lahko uporablja tudi za overitev "
+"oddaljenih odjemalcev v sejah TLS."
 
-#: ../libbalsa/smtp-server.c:612
+#: ../libbalsa/smtp-server.c:566 ../src/mailbox-conf.c:272
+#, fuzzy
+#| msgid "C_ertificate Pass Phrase:"
+msgid "Certificate _Pass Phrase:"
+msgstr "_Å ifrirno geslo:"
+
+#. split large messages
+#: ../libbalsa/smtp-server.c:575
 msgid "Sp_lit message larger than"
 msgstr "Ra_zdeli sporočilo večje kot"
 
-#: ../libbalsa/smtp-server.c:618
-#: ../src/pref-manager.c:1918
+#: ../libbalsa/smtp-server.c:580 ../src/pref-manager.c:2186
 msgid "MB"
 msgstr "MB"
 
-#. Top level
-#. Menus
-#: ../libbalsa/source-viewer.c:46
-#: ../src/ab-main.c:553
-#: ../src/main-window.c:344
-#: ../src/message-window.c:239
-#: ../src/sendmsg-window.c:319
-msgid "_File"
-msgstr "_Datoteka"
-
-#: ../libbalsa/source-viewer.c:47
-#: ../src/filter-edit-dialog.c:321
-#: ../src/main-window.c:345
-#: ../src/message-window.c:240
-#: ../src/sendmsg-window.c:320
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: ../libbalsa/source-viewer.c:48
-#: ../src/main-window.c:346
-#: ../src/message-window.c:241
-msgid "_View"
-msgstr "_Pogled"
-
-#. Items
-#: ../libbalsa/source-viewer.c:50
-#: ../src/mailbox-node.c:1096
-#: ../src/main-window.c:498
-#: ../src/message-window.c:248
-#: ../src/sendmsg-window.c:349
-msgid "_Close"
-msgstr "_Zapri"
-
-#: ../libbalsa/source-viewer.c:51
-msgid "Close the window"
-msgstr "Zapri okno"
-
-#. Edit menu items
-#: ../libbalsa/source-viewer.c:52
-#: ../src/main-window.c:418
-#: ../src/main-window.c:564
-#: ../src/message-window.c:251
-#: ../src/sendmsg-window.c:357
-msgid "_Copy"
-msgstr "_Kopiraj"
-
-#: ../libbalsa/source-viewer.c:53
-msgid "Copy text"
-msgstr "Kopira besedilo"
-
-#: ../libbalsa/source-viewer.c:54
-#: ../src/main-window.c:566
-msgid "_Select Text"
-msgstr "_Izberi besedilo"
-
-#: ../libbalsa/source-viewer.c:55
-#: ../src/main-window.c:567
-msgid "Select entire mail"
-msgstr "Izbere celotno pošto"
-
-#: ../libbalsa/source-viewer.c:60
-msgid "_Escape Special Characters"
-msgstr "_Izpusti posebne znake"
-
-#: ../libbalsa/source-viewer.c:61
-msgid "Escape special and non-ASCII characters"
-msgstr "Izpusti posebne in ne-ASCII znake"
-
-#: ../libbalsa/source-viewer.c:159
+#: ../libbalsa/source-viewer.c:128
 msgid "Mailbox closed"
 msgstr "Poštni predal je zaprt"
 
-#: ../libbalsa/source-viewer.c:280
+#: ../libbalsa/source-viewer.c:238
 msgid "Message Source"
 msgstr "Izvorna koda sporočila"
 
-#: ../libinit_balsa/assistant_helper.c:68
-#, c-format
-msgid "Error loading %s: %s\n"
-msgstr "Napaka med nalaganjem %s: %s\n"
+#: ../libbalsa/source-viewer.c:250 ../src/main-window.c:2068
+#: ../src/message-window.c:848
+#, fuzzy, c-format
+#| msgid "Error loading %s: %s\n"
+msgid "Error adding from %s: %s\n"
+msgstr "Napaka med dodajanjem “%s”: %s"
 
-#: ../libinit_balsa/assistant_helper.c:209
+#: ../libinit_balsa/assistant_helper.c:177
 #, c-format
 msgid "The path %s must be relative to the filesystem root (start with /)."
-msgstr "Pot %s mora biti relativna na korenski datotečni sistem (začeti se mora z /)."
-
-#: ../libinit_balsa/assistant_helper.c:221
-#, c-format
-msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\", with error \"%s\"."
-msgstr "Ni mogoče ustvariti mape: mkdir() na poti \"%s\" je spodletel z napako \"%s\"."
-
-#: ../libinit_balsa/assistant_helper.c:233
-#: ../libinit_balsa/assistant_helper.c:256
-#, c-format
-msgid "The file with pathname \"%s\" is not a directory."
-msgstr "Datoteka z imenom poti \"%s\" ni mapa."
+msgstr ""
+"Pot %s mora biti relativna na korenski datotečni sistem (začeti se mora z /)."
 
-#: ../libinit_balsa/assistant_helper.c:247
-#, c-format
-msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
+#: ../libinit_balsa/assistant_helper.c:189
+#, fuzzy, c-format
+#| msgid ""
+#| "Couldn't create a directory: mkdir() failed on pathname \"%s\", with "
+#| "error \"%s\"."
+msgid ""
+"Couldn’t create a directory: mkdir() failed on pathname “%s”, with error "
+"“%s”."
+msgstr ""
+"Ni mogoče ustvariti mape: mkdir() na poti \"%s\" je spodletel z napako \"%s"
+"\"."
+
+#: ../libinit_balsa/assistant_helper.c:201
+#: ../libinit_balsa/assistant_helper.c:224
+#, 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"
+
+#: ../libinit_balsa/assistant_helper.c:215
+#, fuzzy, c-format
+#| msgid "Couldn't create a directory: mkdir() failed on pathname \"%s\"."
+msgid "Couldn’t create a directory: mkdir() failed on pathname “%s”."
 msgstr "Ni mogoče ustvariti mape: mkdir() na poti \"%s\" je spodletel."
 
-#: ../libinit_balsa/assistant_init.c:51
+#: ../libinit_balsa/assistant_init.c:49
 msgid ""
 "This will exit Balsa.\n"
 "Do you really want to do this?"
@@ -2055,150 +2453,195 @@ msgstr ""
 "Program Balsa bo končan.\n"
 "Ali to res želite storiti?"
 
-#: ../libinit_balsa/assistant_init.c:74
+#: ../libinit_balsa/assistant_init.c:69
 msgid "GnomeCard Address Book"
 msgstr "Imenik GnomeVizitka"
 
-#: ../libinit_balsa/assistant_init.c:81
-#: ../libinit_balsa/assistant_init.c:89
-#: ../src/ab-window.c:231
+#: ../libinit_balsa/assistant_init.c:76 ../libinit_balsa/assistant_init.c:84
+#: ../src/ab-window.c:243
 msgid "Address Book"
 msgstr "Imenik"
 
-#: ../libinit_balsa/assistant_init.c:148
+#: ../libinit_balsa/assistant_init.c:137
 msgid "Configure Balsa"
 msgstr "Nastavi Balso"
 
-#: ../libinit_balsa/assistant_page_defclient.c:59
-msgid "Use balsa as default email client?"
-msgstr "Ali naj bo Balsa privzet poštni odjemalec?"
+#: ../libinit_balsa/assistant_page_defclient.c:54
+msgid "Use Balsa as default email client?"
+msgstr "Ali naj bo program Balsa privzet poštni odjemalec?"
 
-#: ../libinit_balsa/assistant_page_defclient.c:63
+#: ../libinit_balsa/assistant_page_defclient.c:58
 msgid "_Yes"
 msgstr "_Da"
 
-#: ../libinit_balsa/assistant_page_defclient.c:65
+#: ../libinit_balsa/assistant_page_defclient.c:60
 msgid "_No"
 msgstr "_Ne"
 
-#: ../libinit_balsa/assistant_page_defclient.c:102
+#: ../libinit_balsa/assistant_page_defclient.c:94
 msgid "Default Client"
 msgstr "Privzet odjemalec"
 
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:48
 msgid "_Inbox:"
 msgstr "_Dohodni predal:"
 
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:48
 msgid "_Outbox:"
 msgstr "_Odhodni predal:"
 
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:48
 msgid "_Sentbox:"
 msgstr "_Poslana pošta:"
 
-#: ../libinit_balsa/assistant_page_directory.c:60
+#: ../libinit_balsa/assistant_page_directory.c:48
 msgid "_Draftbox:"
 msgstr "Predal os_nutkov:"
 
-#: ../libinit_balsa/assistant_page_directory.c:61
+#: ../libinit_balsa/assistant_page_directory.c:49
 msgid "_Trash:"
 msgstr "_Smeti:"
 
-#: ../libinit_balsa/assistant_page_directory.c:95
-#, c-format
-msgid "The pathname \"%s\" must be specified canonically -- it must start with a '/'."
+#: ../libinit_balsa/assistant_page_directory.c:83
+#, fuzzy, c-format
+#| msgid ""
+#| "The pathname \"%s\" must be specified canonically -- it must start with a "
+#| "'/'."
+msgid ""
+"The pathname “%s” must be specified canonically — it must start with a “/”."
 msgstr "Ime poti \"%s\" mora biti določeno absolutno -- začeti se mora s '/'."
 
-#: ../libinit_balsa/assistant_page_directory.c:161
-#, c-format
-msgid "The mailbox \"%s\" does not appear to be valid."
-msgstr "Poštni predal \"%s\" ni videti veljaven."
+#: ../libinit_balsa/assistant_page_directory.c:123
+#, fuzzy, c-format
+#| msgid "Could not create a mailbox of type %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
+#, 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:204
+#: ../libinit_balsa/assistant_page_directory.c:189
+#, fuzzy, c-format
 msgid ""
-"Please verify the locations of your default mail files.\n"
-"These will be created if necessary."
+"Problem verifying path “%s”:\n"
+"%s"
+msgstr "Preverjanje nadzorne vsote"
+
+#: ../libinit_balsa/assistant_page_directory.c:222
+#, fuzzy
+#| msgid "Other options"
+msgid "_Verify locations"
+msgstr "_Preveri"
+
+#: ../libinit_balsa/assistant_page_directory.c:256
+#, fuzzy
+#| msgid ""
+#| "Please verify the locations of your default mail files.\n"
+#| "These will be created if necessary."
+msgid ""
+"Please verify the locations of your default mail files. These will be "
+"created if necessary."
 msgstr ""
 "Preverite mesta privzetih datotek s pošto.\n"
 "ÄŒe je treba, bodo ustvarjene."
 
-#: ../libinit_balsa/assistant_page_directory.c:266
+#: ../libinit_balsa/assistant_page_directory.c:320
 msgid "Mail Files"
 msgstr "Datoteke s pošto"
 
-#: ../libinit_balsa/assistant_page_directory.c:362
-#: ../libinit_balsa/assistant_page_directory.c:396
-#, c-format
+#: ../libinit_balsa/assistant_page_finish.c:42
+#, fuzzy
+#| msgid ""
+#| "You've successfully set up Balsa. Have fun!\n"
+#| "   -- The Balsa development team"
 msgid ""
-"Problem Creating Mailboxes\n"
-"%s"
-msgstr ""
-"Prišlo je do težav med ustvarjanjem poštnih predalov\n"
-"%s"
-
-#: ../libinit_balsa/assistant_page_finish.c:44
-msgid ""
-"You've successfully set up Balsa. Have fun!\n"
+"You’ve successfully set up Balsa. Have fun!\n"
 "   -- The Balsa development team"
 msgstr ""
 "Program Balsa je uspešno nastavljen!\n"
-"   -- Razvojna ekipa Balse"
+"   -- Razvojna skupina Balse"
 
-#: ../libinit_balsa/assistant_page_finish.c:49
+#: ../libinit_balsa/assistant_page_finish.c:47
 msgid "All Done!"
 msgstr "Vse je opravljeno!"
 
-#: ../libinit_balsa/assistant_page_user.c:57
-msgid "The following settings are also needed (and you can find them later, if need be, in the Email 
application in the 'Preferences' and 'Identities' commands on the 'Tools' menu)"
-msgstr "Naslednje nastavitve so prav tako zahtevane (po potrebi jih je mogoče najti v poštnem programu med 
ukazoma 'Možnosti' in 'Istovetnosti' v meniju 'Orodja')"
+#: ../libinit_balsa/assistant_page_user.c:55
+#, fuzzy
+#| msgid ""
+#| "The following settings are also needed (and you can find them later, if "
+#| "need be, in the Email application in the 'Preferences' and 'Identities' "
+#| "commands on the 'Tools' menu)"
+msgid ""
+"The following settings are also needed (and you can find them later, if need "
+"be, in the Email application in the “Preferences” and “Identities” menu "
+"items)"
+msgstr ""
+"Naslednje nastavitve so prav tako zahtevane (po potrebi jih je mogoče najti "
+"v poštnem programu med ukazoma 'Možnosti' in 'Istovetnosti' v meniju "
+"'Orodja')"
 
-#: ../libinit_balsa/assistant_page_user.c:63
-msgid " Whoever provides your email account should be able to give you the following information (if you 
have a Network Administrator, they may already have set this up for you):"
-msgstr " Ponudnik poštnega računa, vam lahko posreduje naslednje podrobnosti (če imate omrežnega skrbnika, 
so morda podatki že nastavljeni):"
+#: ../libinit_balsa/assistant_page_user.c:61
+msgid ""
+" Whoever provides your email account should be able to give you the "
+"following information (if you have a Network Administrator, they may already "
+"have set this up for you):"
+msgstr ""
+" Ponudnik poštnega računa, vam lahko posreduje naslednje podrobnosti (če "
+"imate omrežnega skrbnika, so morda podatki že nastavljeni):"
 
-#: ../libinit_balsa/assistant_page_user.c:70
+#: ../libinit_balsa/assistant_page_user.c:68
+msgid "SSL"
+msgstr "SSL"
+
+#: ../libinit_balsa/assistant_page_user.c:74
 msgid "Yes, remember it"
 msgstr "Da, zapomni si"
 
-#: ../libinit_balsa/assistant_page_user.c:70
+#: ../libinit_balsa/assistant_page_user.c:74
 msgid "No, type it in every time"
-msgstr "Ne, vsakokratno vnašanje gesla"
+msgstr "Ne, vsakokrat opomni za geslo"
 
-#: ../libinit_balsa/assistant_page_user.c:103
+#: ../libinit_balsa/assistant_page_user.c:105
 msgid "Name of mail server for incoming _mail:"
 msgstr "Ime poštnega strežnika _prihajajoče pošte:"
 
-#: ../libinit_balsa/assistant_page_user.c:108
+#: ../libinit_balsa/assistant_page_user.c:110
 msgid "_Type of mail server:"
 msgstr "_Vrsta poštnega strežnika:"
 
-#: ../libinit_balsa/assistant_page_user.c:112
-msgid "Connect using _SSL:"
-msgstr "Povezava z uporabo _SSL:"
+#: ../libinit_balsa/assistant_page_user.c:114
+#, fuzzy
+#| msgid "Connect using _SSL:"
+msgid "Connection _Security"
+msgstr "Varnost:"
 
-#: ../libinit_balsa/assistant_page_user.c:115
+#: ../libinit_balsa/assistant_page_user.c:118
 msgid "Your email _login name:"
 msgstr "Uporabniško ime:"
 
-#: ../libinit_balsa/assistant_page_user.c:118
+#: ../libinit_balsa/assistant_page_user.c:121
 msgid "Your _password:"
 msgstr "_Geslo:"
 
-#: ../libinit_balsa/assistant_page_user.c:126
+#: ../libinit_balsa/assistant_page_user.c:128
 msgid "_SMTP Server:"
 msgstr "S_trežnik SMTP:"
 
 #. 2.1
-#: ../libinit_balsa/assistant_page_user.c:131
+#: ../libinit_balsa/assistant_page_user.c:132
 msgid "Your real _name:"
 msgstr "Pravo _ime:"
 
-#: ../libinit_balsa/assistant_page_user.c:137
-msgid "Your _Email Address, for this email account:"
-msgstr "Vaš elektronski naslov za ta račun:"
+#: ../libinit_balsa/assistant_page_user.c:138
+#, 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."
 
-#: ../libinit_balsa/assistant_page_user.c:142
+#: ../libinit_balsa/assistant_page_user.c:143
 msgid "_Remember your password:"
 msgstr "_Zapomni si geslo:"
 
@@ -2206,15 +2649,15 @@ msgstr "_Zapomni si geslo:"
 msgid "_Local mail directory:"
 msgstr "_Krajevna poštna mapa:"
 
-#: ../libinit_balsa/assistant_page_user.c:168
+#: ../libinit_balsa/assistant_page_user.c:166
 msgid "User Settings"
 msgstr "Uporabniške nastavitve"
 
-#: ../libinit_balsa/assistant_page_user.c:290
+#: ../libinit_balsa/assistant_page_user.c:293
 msgid "Default Identity"
 msgstr "Privzeta istovetnost"
 
-#: ../libinit_balsa/assistant_page_user.c:335
+#: ../libinit_balsa/assistant_page_user.c:331
 #, c-format
 msgid ""
 "Local Mail Problem\n"
@@ -2223,316 +2666,439 @@ msgstr ""
 "Krajevni poštni problem\n"
 "%s"
 
-#: ../libinit_balsa/assistant_page_welcome.c:29
+#: ../libinit_balsa/assistant_page_welcome.c:27
 msgid "Welcome to Balsa!"
 msgstr "Dobrodošli v Balsi!"
 
-#: ../libinit_balsa/assistant_page_welcome.c:32
+#: ../libinit_balsa/assistant_page_welcome.c:30
+#, fuzzy
+#| msgid ""
+#| "Before you can send or receive email:\n"
+#| "\n"
+#| "-- either you should already have Internet access and an email account, "
+#| "provided by an Internet Service Provider, and you should have made that "
+#| "Internet connection on your computer\n"
+#| "\n"
+#| "-- or your Network Administrator at your place of work/study/similar may "
+#| "have set up your computer to connect to the network."
 msgid ""
 "Before you can send or receive email:\n"
 "\n"
-"-- either you should already have Internet access and an email account, provided by an Internet Service 
Provider, and you should have made that Internet connection on your computer\n"
+"• either you should already have Internet access and an email account, "
+"provided by an Internet Service Provider, and you should have made that "
+"Internet connection on your computer\n"
 "\n"
-"-- or your Network Administrator at your place of work/study/similar may have set up your computer to 
connect to the network."
+"• or your network administrator at your place of work/study/similar may have "
+"set up your computer to connect to the network."
 msgstr ""
 "Pred pošiljanjem ali prejemanjem pošte:\n"
 "\n"
-"-- mora biti dostop do medmrežja in poštnega računa omogočen ter pravilno nastavljen\n"
+"-- mora biti dostop do medmrežja in poštnega računa omogočen ter pravilno "
+"nastavljen\n"
 "\n"
 "-- ali pa je računalnik neposredno povezan v omrežje."
 
-#: ../sounds/balsa.soundlist.in.h:1
-msgid "Balsa E-mail reader"
-msgstr "Balsa poštni bralnik"
-
-#: ../sounds/balsa.soundlist.in.h:2
-msgid "New mail notification"
-msgstr "Obvestilo o prispeli pošti"
-
-#: ../sounds/balsa.soundlist.in.h:3
-msgid "Program startup"
-msgstr "Zagon programa"
-
-#: ../src/ab-main.c:228
-#: ../src/ab-window.c:691
-msgid " address book: "
-msgstr " imenik:"
-
-#: ../src/ab-main.c:554
-msgid "_Entry"
-msgstr "_Vnos"
-
-#: ../src/ab-main.c:555
-#: ../src/main-window.c:350
-msgid "_Help"
-msgstr "Pomo_č"
-
-#. new button
-#: ../src/ab-main.c:556
-#: ../src/filter-edit-dialog.c:226
-#: ../src/mailbox-node.c:1061
-#: ../src/main-window.c:352
-#: ../src/main-window.c:586
-#: ../src/main-window.c:595
-msgid "_New"
-msgstr "_Novo"
+#: ../libnetclient/net-client.c:78 ../libnetclient/net-client.c:116
+#, c-format
+msgid "network client is already connected"
+msgstr ""
 
-#: ../src/ab-main.c:557
-#: ../src/address-book-config.c:871
-msgid "VCard Address Book (GnomeCard)"
-msgstr "Ime imenika VCard (GnomeVizitka)"
+#: ../libnetclient/net-client.c:155 ../libnetclient/net-client.c:198
+#, fuzzy, c-format
+msgid "network client is not connected"
+msgstr "Povezano"
 
-#: ../src/ab-main.c:559
-#: ../src/address-book-config.c:877
-msgid "External query (a program)"
-msgstr "Zunanja poizvedba (program)"
+#: ../libnetclient/net-client.c:166
+#, c-format
+msgid "reply length %lu exceeds the maximum allowed length %lu"
+msgstr ""
 
-#: ../src/ab-main.c:561
-#: ../src/address-book-config.c:882
-msgid "LDIF Address Book"
-msgstr "Imenik LDIF"
+#: ../libnetclient/net-client.c:181
+#, fuzzy, c-format
+msgid "connection lost"
+msgstr "Izgubljeno"
+
+#: ../libnetclient/net-client.c:229
+#, fuzzy, c-format
+msgid "line too long"
+msgstr "Ime je predolgo"
+
+#: ../libnetclient/net-client.c:298
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+#| msgid "Error loading Face: %s"
+msgid "error loading key: %s"
+msgstr "Napaka med nalaganjem Face: %s"
 
-#: ../src/ab-main.c:564
-#: ../src/address-book-config.c:888
-msgid "LDAP Address Book"
-msgstr "Imenik LDAP"
+#: ../libnetclient/net-client.c:412
+#, fuzzy, c-format
+#| msgid "Disconnected"
+msgid "not connected"
+msgstr "povezano.\n"
+
+#: ../libnetclient/net-client.c:414
+#, fuzzy, c-format
+msgid "connection is already encrypted"
+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
+#, fuzzy, c-format
+#| msgid "Mail server: %s\n"
+msgid "bad server reply: %s"
+msgstr "Strežnik je vrnil nepopoln odgovor »%s«."
+
+#: ../libnetclient/net-client-pop.c:253
+#, 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
+#, c-format
+msgid "error: %s"
+msgstr "napaka: %s"
+
+#: ../libnetclient/net-client-pop.c:426
+#, 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"
 
-#: ../src/ab-main.c:568
-#: ../src/address-book-config.c:510
-#: ../src/address-book-config.c:895
-msgid "GPE Address Book"
-msgstr "Imenik GPE"
+#: ../libnetclient/net-client-pop.c:508 ../libnetclient/net-client-smtp.c:411
+#, fuzzy, c-format
+msgid "no suitable authentication mechanism"
+msgstr ""
+"Prijava na strežnik \"%s\" je spodletela. Ustreznega načina overitve ni "
+"mogoče najti."
+
+#: ../libnetclient/net-client-smtp.c:142
+#, fuzzy, c-format
+#| msgid ""
+#| "\n"
+#| "the server does not support ACL's"
+msgid "remote server does not support STARTTLS"
+msgstr "Strežnik ne podpira protokola STARTTLS"
+
+#: ../libnetclient/net-client-smtp.c:689
+#, fuzzy, c-format
+#| msgid "Sending error: %s"
+msgid "transient error %d: %s"
+msgstr "Napaka v vrstici %d: %s"
+
+#: ../libnetclient/net-client-smtp.c:694
+#, fuzzy, c-format
+#| msgid "Sending error: %s"
+msgid "permanent error %d: %s"
+msgstr "Napaka v vrstici %d: %s"
+
+#: ../libnetclient/net-client-utils.c:143
+#, fuzzy, c-format
+#| msgid "Removing duplicates failed: %s"
+msgid "importing GSS service name %s failed: %s"
+msgstr "Odstranjevanje dvojnikov ni uspelo: %s"
 
-#: ../src/ab-main.c:572
-msgid "Rubrica Address Book"
-msgstr "Imenik Rubrica"
-
-#: ../src/ab-main.c:575
-msgid "_Properties"
-msgstr "_Lastnosti"
-
-#: ../src/ab-main.c:576
-msgid "Edit address book properties"
-msgstr "Uredi lastnosti imenika"
-
-#: ../src/ab-main.c:577
-#: ../src/balsa-index.c:1911
-#: ../src/filter-edit-dialog.c:232
-#: ../src/mailbox-node.c:1088
-#: ../src/mailbox-node.c:1104
-#: ../src/pref-manager.c:1716
-#: ../src/pref-manager.c:1791
-#: ../src/pref-manager.c:2968
-msgid "_Delete"
-msgstr "_Izbriši"
+#: ../libnetclient/net-client-utils.c:186
+#, c-format
+msgid "cannot initialize GSS security context: %s"
+msgstr ""
 
-#: ../src/ab-main.c:578
-msgid "Delete address book"
-msgstr "Izbriše imenik"
+#: ../libnetclient/net-client-utils.c:225
+#, c-format
+msgid "malformed GSS security token: %s"
+msgstr ""
 
-#: ../src/ab-main.c:579
-#: ../src/main-window.c:386
-msgid "_Quit"
-msgstr "_Končaj"
+#: ../libnetclient/net-client-utils.c:234
+#, c-format
+msgid "malformed GSS security token"
+msgstr ""
 
-#: ../src/ab-main.c:579
-msgid "Exit the program"
-msgstr "Izhod iz programa"
+#: ../libnetclient/net-client-utils.c:250
+#, c-format
+msgid "cannot create GSS login request: %s"
+msgstr ""
 
-#: ../src/ab-main.c:581
-msgid "_New Entry"
-msgstr "_Nov vnos"
+#: ../libnetclient/net-client-utils.c:315
+#, fuzzy, c-format
+#| msgid "unknown error"
+msgid "unknown error code %u:%u"
+msgstr "Koda napake %u med poizvedovanjem vnosa: %s"
 
-#: ../src/ab-main.c:582
-msgid "Add new entry"
-msgstr "Doda nov vnos"
+#: ../sounds/balsa.soundlist.in.h:1
+#, fuzzy
+#| msgid "Balsa E-mail reader"
+msgid "Balsa Email Reader"
+msgstr "Balsa"
 
-#: ../src/ab-main.c:583
-msgid "_Delete Entry"
-msgstr "_Izbriši vnos"
+#: ../sounds/balsa.soundlist.in.h:2
+#, fuzzy
+#| msgid "Program startup"
+msgid "Program start-up"
+msgstr ""
+"Programa ni mogoče začeti:\n"
+"%s"
 
-#: ../src/ab-main.c:584
-msgid "Delete entry"
-msgstr "Izbris vnosa"
+#: ../sounds/balsa.soundlist.in.h:3
+msgid "New mail notification"
+msgstr "Obvestilo o prispeli pošti"
 
-#: ../src/ab-main.c:585
-#: ../src/main-window.c:458
-msgid "_About"
-msgstr "_O programu"
+#: ../src/ab-main.c:212 ../src/ab-window.c:702
+msgid " address book: "
+msgstr " imenik:"
 
-#: ../src/ab-main.c:817
+#: ../src/ab-main.c:744
 msgid "_Name"
 msgstr "_Ime"
 
-#: ../src/ab-main.c:833
+#: ../src/ab-main.c:760
 msgid "_Address"
 msgstr "_Naslov"
 
-#: ../src/ab-main.c:959
+#: ../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
+msgid "_Apply"
+msgstr "_Uveljavi"
+
+#: ../src/ab-main.c:886
 msgid "F_ilter:"
 msgstr "_Filter:"
 
-#: ../src/ab-window.c:172
-#: ../src/filter-edit-dialog.c:209
-#: ../src/filter-export-dialog.c:92
-#: ../src/filter-run-dialog.c:223
-#: ../src/filter-run-dialog.c:297
+#: ../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
 msgid "Name"
 msgstr "Ime"
 
-#: ../src/ab-window.c:180
-msgid "E-Mail Address"
-msgstr "Naslov elektronske pošte"
+#: ../src/ab-window.c:192 ../src/balsa-print-object-text.c:502
+msgid "Email Address"
+msgstr "Elektronski naslov"
 
-#. -- table column 1 --
+#. -- grid column 1 --
 #. Entry widget for finding an address
-#: ../src/ab-window.c:281
+#: ../src/ab-window.c:293
 msgid "_Search for Name:"
 msgstr "_Išči po imenu:"
 
-#: ../src/ab-window.c:316
-msgid "Run Editor"
-msgstr "Zagon urejevalnika"
+#: ../src/ab-window.c:326
+#, fuzzy
+#| msgid "Run Editor"
+msgid "Run _Editor"
+msgstr "Urejevalnik"
 
-#: ../src/ab-window.c:323
-msgid "_Re-Import"
-msgstr "_Znova uvozi"
+#: ../src/ab-window.c:332
+#, fuzzy
+#| msgid "_Re-Import"
+msgid "_Re-import"
+msgstr "Od:"
 
-#. -- table column 3 --
+#. -- grid column 3 --
 #. label for selected addresses in compose mode
-#: ../src/ab-window.c:355
+#: ../src/ab-window.c:366
 msgid "Send-To"
 msgstr "Pošlji"
 
 #. mode switching stuff
-#: ../src/ab-window.c:370
+#: ../src/ab-window.c:380
 msgid "Treat multiple addresses as:"
 msgstr "Z več naslovi ravnaj kot:"
 
-#: ../src/ab-window.c:374
+#: ../src/ab-window.c:384
 msgid "alternative addresses for the same person"
 msgstr "dodatni naslovi iste osebe"
 
-#: ../src/ab-window.c:379
+#: ../src/ab-window.c:389
 msgid "a distribution list"
 msgstr "distribucijski seznam"
 
-#: ../src/ab-window.c:422
+#: ../src/ab-window.c:433
 #, c-format
 msgid "Could not launch %s: %s"
 msgstr "Ni mogoče zagnati %s: %s"
 
-#: ../src/ab-window.c:719
-#, c-format
+#: ../src/ab-window.c:730
+#, fuzzy, c-format
+#| msgid ""
+#| "Error opening address book '%s':\n"
+#| "%s"
 msgid ""
-"Error opening address book '%s':\n"
-"%s"
-msgstr ""
-"Napaka med odpiranjem imenika '%s':\n"
+"Error opening address book “%s”:\n"
 "%s"
+msgstr "Poteka odpiranje imenika »%s«"
 
 #: ../src/address-book-config.c:177
 msgid "Suggest complete addresses:"
 msgstr "Predlagaj celotne naslove:"
 
-#: ../src/address-book-config.c:183
+#: ../src/address-book-config.c:182
 msgid "as I type"
 msgstr "med tipkanjem"
 
-#: ../src/address-book-config.c:192
+#: ../src/address-book-config.c:190
 msgid "when I hit the Escape key"
 msgstr "ob pritisku ubežne tipke"
 
-#: ../src/address-book-config.c:229
-#: ../src/address-book-config.c:331
+#: ../src/address-book-config.c:225 ../src/address-book-config.c:330
 #, c-format
 msgid "Modify %s Address Book"
 msgstr "Spremeni imenik %s"
 
-#: ../src/address-book-config.c:233
-#: ../src/address-book-config.c:335
+#: ../src/address-book-config.c:229 ../src/address-book-config.c:333
 #, 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
+msgid "_Add"
+msgstr "_Dodaj"
+
 #. mailbox name
 #. may be NULL
 #. mailbox name
-#: ../src/address-book-config.c:253
-#: ../src/address-book-config.c:375
-#: ../src/address-book-config.c:441
-#: ../src/address-book-config.c:508
+#: ../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
 msgid "A_ddress Book Name:"
 msgstr "_Ime imenika:"
 
-#: ../src/address-book-config.c:380
+#: ../src/address-book-config.c:374
+#, fuzzy, c-format
+#| msgid "Modify %s Address Book"
+msgid "Modify Osmo Address Book"
+msgstr "Spremeni imenik %s"
+
+#: ../src/address-book-config.c:378
+#, fuzzy, c-format
+#| msgid "Add %s Address Book"
+msgid "Add Osmo Address Book"
+msgstr "Dod_aj v imenik ..."
+
+#: ../src/address-book-config.c:431
 msgid "Load program location:"
 msgstr "Mesto programa za nalaganje:"
 
-#: ../src/address-book-config.c:386
+#: ../src/address-book-config.c:436
 msgid "Select load program for address book"
 msgstr "Izbor programa za nalaganje imenika"
 
-#: ../src/address-book-config.c:393
+#: ../src/address-book-config.c:444
 msgid "Save program location:"
 msgstr "Mesto programa za shranjevanje:"
 
-#: ../src/address-book-config.c:399
+#: ../src/address-book-config.c:449
 msgid "Select save program for address book"
 msgstr "Izbor programa za shranjevanje imenika"
 
-#: ../src/address-book-config.c:446
+#: ../src/address-book-config.c:497
 msgid "_Host Name"
 msgstr "_Ime gostitelja"
 
-#: ../src/address-book-config.c:451
+#: ../src/address-book-config.c:502
 msgid "Base Domain _Name"
 msgstr "_Osnovno ime domene"
 
-#: ../src/address-book-config.c:456
+#: ../src/address-book-config.c:507
 msgid "_User Name (Bind DN)"
 msgstr "_Uporabniško ime (Poveži ime domene)"
 
-#: ../src/address-book-config.c:461
+#: ../src/address-book-config.c:512
 msgid "_Password"
 msgstr "_Geslo"
 
-#: ../src/address-book-config.c:467
+#: ../src/address-book-config.c:518
 msgid "_User Address Book DN"
 msgstr "Ime domene uporabniškega  _imenika"
 
-#: ../src/address-book-config.c:473
+#: ../src/address-book-config.c:524
 msgid "Enable _TLS"
 msgstr "Omogoči _TLS"
 
-#: ../src/address-book-config.c:541
-#: ../src/main-window.c:2666
-#: ../src/main-window.c:4426
+#: ../src/address-book-config.c:561 ../src/address-book-config.c:961
+msgid "GPE Address Book"
+msgstr "Imenik GPE"
+
+#: ../src/address-book-config.c:601 ../src/main-window.c:949
+#: ../src/main-window.c:4083
 #, c-format
 msgid "Error displaying help: %s\n"
 msgstr "Napaka med prikazovanjem pomoči: %s\n"
 
-#: ../src/address-book-config.c:618
-msgid "No path found.  Do you want to give one?"
+#: ../src/address-book-config.c:678
+#, 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:902
+#: ../src/address-book-config.c:937
+#, fuzzy
+#| msgid "VCard Address Book (GnomeCard)"
+msgid "vCard Address Book (GnomeCard)"
+msgstr "Imenik GnomeVizitka"
+
+#: ../src/address-book-config.c:943
+msgid "External query (a program)"
+msgstr "Zunanja poizvedba (program)"
+
+#: ../src/address-book-config.c:948
+msgid "LDIF Address Book"
+msgstr "Imenik LDIF"
+
+#: ../src/address-book-config.c:954
+msgid "LDAP Address Book"
+msgstr "Imenik LDAP"
+
+#: ../src/address-book-config.c:968
 msgid "Rubrica2 Address Book"
 msgstr "Imenik Rubrica2"
 
-#: ../src/balsa-app.c:79
-#: ../src/folder-conf.c:276
-#: ../src/mailbox-conf.c:1320
+#: ../src/address-book-config.c:975
+#, fuzzy
+#| msgid "Address Book"
+msgid "Osmo Address Book"
+msgstr "_Imenik"
+
+#: ../src/balsa-app.c:64 ../src/folder-conf.c:281 ../src/mailbox-conf.c:1378
+#, 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"
 
-#: ../src/balsa-app.c:82
-#: ../src/folder-conf.c:279
-#: ../src/mailbox-conf.c:1323
+#: ../src/balsa-app.c:70 ../src/folder-conf.c:287 ../src/mailbox-conf.c:1384
 msgid "_Remember password"
 msgstr "_Zapomni si geslo"
 
-#: ../src/balsa-app.c:88
+#: ../src/balsa-app.c:76
 #, c-format
 msgid ""
 "Opening remote mailbox %s.\n"
@@ -2541,1073 +3107,1181 @@ msgstr ""
 "Odpiranje oddaljenega poštnega predala %s.\n"
 "_Geslo za %s@%s:"
 
-#: ../src/balsa-app.c:93
+#: ../src/balsa-app.c:81
 #, c-format
 msgid "_Password for %s@%s (%s):"
 msgstr "_Geslo za %s@%s (%s):"
 
-#: ../src/balsa-app.c:96
+#: ../src/balsa-app.c:84
 msgid "Password needed"
 msgstr "Zahtevano je geslo"
 
-#: ../src/balsa-app.c:551
-#, c-format
-msgid "Couldn't open mailbox \"%s\""
-msgstr "Ni mogoče odpreti poštnega predala \"%s\""
-
-#: ../src/balsa-index.c:359
-msgid "From"
-msgstr "Od"
-
-#: ../src/balsa-index.c:375
-#: ../src/pref-manager.c:418
-msgid "Subject"
-msgstr "Zadeva"
+#: ../src/balsa-app.c:523
+#, 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:392
-#: ../src/pref-manager.c:419
+#: ../src/balsa-index.c:384 ../src/pref-manager.c:219
 msgid "Date"
 msgstr "Datum"
 
-#: ../src/balsa-index.c:407
-#: ../src/pref-manager.c:420
-#: ../src/sendmsg-window.c:2996
+#: ../src/balsa-index.c:399 ../src/pref-manager.c:220
+#: ../src/sendmsg-window.c:2699
 msgid "Size"
 msgstr "Velikost"
 
-#. FIXME: this is hack!
-#: ../src/balsa-index.c:1055
-msgid "To"
-msgstr "Za"
-
-#: ../src/balsa-index.c:1726
+#: ../src/balsa-index.c:1653
 #, c-format
 msgid "Move to Trash failed: %s"
 msgstr "Premikanje v smeti ni bilo uspešno: %s"
 
-#. Message menu items
-#: ../src/balsa-index.c:1884
-#: ../src/main-window.c:514
-#: ../src/message-window.c:268
-msgid "_Reply..."
-msgstr "_Odgovori ..."
-
-#: ../src/balsa-index.c:1886
-msgid "Reply To _All..."
-msgstr "Odgovori _vsem ..."
-
-#: ../src/balsa-index.c:1888
-msgid "Reply To _Group..."
-msgstr "Odgovori s_kupini ..."
-
-#: ../src/balsa-index.c:1890
-msgid "_Forward Attached..."
-msgstr "_Posreduj priloženo ..."
+#: ../src/balsa-index.c:1811
+#, fuzzy
+#| msgid "Reply"
+msgid "_Reply…"
+msgstr "Odgovo_ri"
+
+#: ../src/balsa-index.c:1813
+#, fuzzy
+#| msgid "Reply To _All..."
+msgid "Reply To _All…"
+msgstr "Odgovori _vsem"
+
+#: ../src/balsa-index.c:1815
+#, fuzzy
+#| msgid "Reply To _Group..."
+msgid "Reply To _Group…"
+msgstr ""
+"Odgovori\n"
+"skupini"
 
-#: ../src/balsa-index.c:1892
-msgid "Forward _Inline..."
-msgstr "Posreduj _medvrstično ..."
+#: ../src/balsa-index.c:1817
+#, fuzzy
+#| msgid "_Forward Attached..."
+msgid "_Forward Attached…"
+msgstr "P_osreduj kot priloženo ..."
+
+#: ../src/balsa-index.c:1819
+#, fuzzy
+#| msgid "Forward _Inline..."
+msgid "Forward _Inline…"
+msgstr "P_osreduj v novem sporočilu"
+
+#: ../src/balsa-index.c:1821
+#, fuzzy
+#| msgid "_Pipe through..."
+msgid "_Pipe through…"
+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:1894
-#: ../src/main-window.c:541
-msgid "_Pipe through..."
-msgstr "_Prenesi skozi ..."
+#: ../src/balsa-index.c:1823
+#, fuzzy
+#| msgid "Store Address"
+msgid "_Store Address…"
+msgstr "Shrani naslov"
 
-#: ../src/balsa-index.c:1896
-#: ../src/main-window.c:521
-msgid "_Store Address..."
-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
+msgid "_Delete"
+msgstr "_Izbriši"
 
-#: ../src/balsa-index.c:1916
+#: ../src/balsa-index.c:1841
 msgid "_Undelete"
 msgstr "Ra_zveljavi izbris"
 
-#: ../src/balsa-index.c:1921
+#: ../src/balsa-index.c:1845
 msgid "Move To _Trash"
 msgstr "Premakni v s_meti"
 
-#: ../src/balsa-index.c:1925
+#: ../src/balsa-index.c:1849
 msgid "T_oggle"
 msgstr "P_reklopi"
 
-#. Message:toggle-flag submenu items
-#: ../src/balsa-index.c:1929
-#: ../src/main-window.c:591
-#: ../src/main-window.c:636
+#: ../src/balsa-index.c:1852
 msgid "_Flagged"
 msgstr "Z _zastavico"
 
-#: ../src/balsa-index.c:1932
+#: ../src/balsa-index.c:1855
 msgid "_Unread"
 msgstr "N_eprebrano"
 
-#: ../src/balsa-index.c:1940
+#: ../src/balsa-index.c:1863
 msgid "_Move to"
 msgstr "Pre_makni v"
 
-#: ../src/balsa-index.c:1948
+#: ../src/balsa-index.c:1870
 msgid "_View Source"
 msgstr "_Ogled izvorne kode"
 
-#: ../src/balsa-index.c:2193
-#, c-format
-msgid "Failed to copy %d message to mailbox \"%s\": %s"
-msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
+#: ../src/balsa-index.c:2116
+#, fuzzy, c-format
+#| msgid "Failed to copy %d message to mailbox \"%s\": %s"
+#| msgid_plural "Failed to copy %d messages to mailbox \"%s\": %s"
+msgid "Failed to copy %d message to mailbox “%s”: %s"
+msgid_plural "Failed to copy %d messages to mailbox “%s”: %s"
 msgstr[0] "Kopiranje %d sporočil v poštni predal \"%s\" je spodletelo: %s"
 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:2205
-#, c-format
-msgid "Copied to \"%s\"."
-msgstr "Skopirano v \"%s\"."
+#: ../src/balsa-index.c:2128
+#, fuzzy, c-format
+#| msgid "Copied to \"%s\"."
+msgid "Copied to “%s”."
+msgstr "%s od %s kopirano"
 
-#: ../src/balsa-index.c:2206
-#, c-format
-msgid "Moved to \"%s\"."
+#: ../src/balsa-index.c:2129
+#, fuzzy, c-format
+#| msgid "Moved to \"%s\"."
+msgid "Moved to “%s”."
 msgstr "Premaknjeno v \"%s\"."
 
-#: ../src/balsa-index.c:2308
+#: ../src/balsa-index.c:2233
 #, c-format
 msgid "Committing mailbox %s failed."
 msgstr "Uveljavljanje poštnega predala %s ni uspelo."
 
-#: ../src/balsa-index.c:2406
+#: ../src/balsa-index.c:2342
 #, c-format
 msgid "Cannot process the message: %s"
 msgstr "Sporočila ni mogoče obdelati: %s"
 
-#: ../src/balsa-index.c:2529
+#: ../src/balsa-index.c:2458
 #, 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:2556
+#: ../src/balsa-index.c:2485
 #, 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:2720
+#: ../src/balsa-index.c:2652
 msgid "Pipe message through a program"
 msgstr "Pošlji sporočila skozi program"
 
-#: ../src/balsa-index.c:2723
+#: ../src/balsa-index.c:2656
 msgid "_Run"
 msgstr "_Zaženi"
 
-#: ../src/balsa-index.c:2735
+#: ../src/balsa-index.c:2668
 msgid "Specify the program to run:"
 msgstr "Navedite program za zagon:"
 
-#: ../src/balsa-mblist.c:357
+#: ../src/balsa-mblist.c:353
 msgid "Mailbox"
 msgstr "Poštni predal"
 
-#: ../src/balsa-mblist.c:1132
-#: ../src/balsa-mblist.c:1182
+#: ../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:1768
-msgid "_Other..."
-msgstr "Dr_ugo ..."
+#: ../src/balsa-mblist.c:1774
+msgid "_Other…"
+msgstr "_Drugo ..."
 
-#: ../src/balsa-mblist.c:1836
+#: ../src/balsa-mblist.c:1891
 msgid "Choose destination folder"
 msgstr "Izbor ciljne mape"
 
-#: ../src/balsa-mblist.c:2049
-msgid "Other..."
-msgstr "Drugo ..."
+#: ../src/balsa-mblist.c:2085
+#, fuzzy
+#| msgid "Other..."
+msgid "Other…"
+msgstr "Ostalo:"
 
-#: ../src/balsa-message.c:303
+#: ../src/balsa-message.c:283
 msgid "Check cryptographic signature"
 msgstr "Preveri Å¡ifrirni podpis"
 
-#: ../src/balsa-message.c:324
+#: ../src/balsa-message.c:300
 msgid "Select message part to display"
 msgstr "Izbor dela sporočila za prikaz"
 
-#: ../src/balsa-message.c:411
+#: ../src/balsa-message.c:375
 msgid "Wrapped"
 msgstr "Prelomljeno"
 
-#: ../src/balsa-message.c:415
+#: ../src/balsa-message.c:379
 msgid "Not found"
 msgstr "Ni zadetkov"
 
-#: ../src/balsa-message.c:604
+#: ../src/balsa-message.c:608
 msgid "Find:"
 msgstr "Poišči:"
 
-#: ../src/balsa-message.c:617
-#: ../src/toolbar-factory.c:142
+#: ../src/balsa-message.c:620 ../src/toolbar-factory.c:149
 msgid "Previous"
 msgstr "Nazaj"
 
-#: ../src/balsa-message.c:625
-#: ../src/toolbar-factory.c:143
+#: ../src/balsa-message.c:627 ../src/toolbar-factory.c:150
 msgid "Next"
 msgstr "Naprej"
 
-#: ../src/balsa-message.c:716
+#: ../src/balsa-message.c:711
 msgid "Content"
 msgstr "Vsebina"
 
-#: ../src/balsa-message.c:807
+#: ../src/balsa-message.c:797
 msgid "Message parts"
 msgstr "Deli sporočila"
 
-#: ../src/balsa-message.c:986
-msgid "Save selected as..."
-msgstr "Shrani izbrano kot ..."
+#: ../src/balsa-message.c:989
+#, fuzzy
+#| msgid "Save selected as..."
+msgid "Save selected as…"
+msgstr "Shrani izbrano"
 
-#: ../src/balsa-message.c:993
-msgid "Save selected to folder..."
-msgstr "Shrani izbrano v mapo ..."
+#: ../src/balsa-message.c:996
+#, fuzzy
+#| msgid "Save selected to folder..."
+msgid "Save selected to folder…"
+msgstr "Shrani izbrano"
 
-#: ../src/balsa-message.c:1086
+#: ../src/balsa-message.c:1106
 msgid "(No sender)"
 msgstr "(ni pošiljatelja)"
 
-#: ../src/balsa-message.c:1140
-#: ../src/balsa-message.c:1152
-#, c-format
-msgid "Could not access message %u in mailbox \"%s\"."
-msgstr "Ni mogoče dostopati do sporočila %u v poštnem predalu \"%s\"."
+#: ../src/balsa-message.c:1159 ../src/balsa-message.c:1171
+#, 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:1326
+#: ../src/balsa-message.c:1338
 msgid "mixed parts"
 msgstr "mešani deli"
 
-#: ../src/balsa-message.c:1328
+#: ../src/balsa-message.c:1340
 msgid "alternative parts"
 msgstr "dodatni deli"
 
-#: ../src/balsa-message.c:1330
+#: ../src/balsa-message.c:1342
 msgid "signed parts"
 msgstr "podpisani deli"
 
-#: ../src/balsa-message.c:1332
+#: ../src/balsa-message.c:1344
 msgid "encrypted parts"
 msgstr "Å¡ifrirani deli"
 
-#: ../src/balsa-message.c:1334
-msgid "rfc822 message"
-msgstr "sporočilo rfc822"
+#: ../src/balsa-message.c:1346
+msgid "RFC822 message"
+msgstr "Sporočilo RFC822"
 
-#: ../src/balsa-message.c:1336
-#, c-format
-msgid "\"%s\" parts"
-msgstr "\"%s\" deli"
+#: ../src/balsa-message.c:1348
+#, fuzzy, c-format
+#| msgid "\"%s\" parts"
+msgid "“%s” parts"
+msgstr "delov"
 
-#: ../src/balsa-message.c:1384
+#: ../src/balsa-message.c:1396
 msgid "force inline for all parts"
 msgstr "vsili vse dele medvrstično"
 
-#: ../src/balsa-message.c:1427
-#, c-format
-msgid "rfc822 message (from %s, subject \"%s\")"
-msgstr "sporočilo rfc822 (pošiljatelj %s, zadeva \"%s\")"
-
 #: ../src/balsa-message.c:1439
+#, 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
 msgid "complete message"
 msgstr "celotno sporočilo"
 
-#: ../src/balsa-message.c:1456
+#: ../src/balsa-message.c:1468
 #, c-format
 msgid "part %s: %s (file %s)"
 msgstr "del %s: %s (datoteka %s)"
 
-#: ../src/balsa-message.c:1467
+#: ../src/balsa-message.c:1479
 #, c-format
 msgid "part %s: %s"
 msgstr "del %s: %s"
 
-#: ../src/balsa-message.c:1482
+#: ../src/balsa-message.c:1494
 msgid "encrypted: "
 msgstr "Å¡ifrirano:"
 
-#: ../src/balsa-message.c:1619
+#: ../src/balsa-message.c:1634
 #, c-format
 msgid "Reading embedded message failed: %s"
 msgstr "Branje vključenega sporočila je spodletelo: %s"
 
-#: ../src/balsa-message.c:1627
+#: ../src/balsa-message.c:1642
 #, c-format
 msgid "Appending message to %s failed: %s"
 msgstr "Pripenjanje sporočila %s je spodletelo: %s"
 
-#: ../src/balsa-message.c:1656
-msgid "_Save..."
-msgstr "_Shrani ..."
+#: ../src/balsa-message.c:1671
+#, fuzzy
+#| msgid "_Save"
+msgid "_Save…"
+msgstr "_Shrani:"
 
-#: ../src/balsa-message.c:1665
-#: ../src/balsa-mime-widget-message.c:458
-msgid "_Copy to folder..."
-msgstr "_Kopiraj v mapo ..."
+#: ../src/balsa-message.c:1680 ../src/balsa-mime-widget-message.c:447
+#, fuzzy
+#| msgid "Copy to folder:"
+msgid "_Copy to folder…"
+msgstr "Kopira v mapo"
 
-#: ../src/balsa-message.c:1748
+#: ../src/balsa-message.c:1763
 msgid "Select folder for saving selected parts"
 msgstr "Izbor mape za shranjevanje izbranih delov"
 
-#: ../src/balsa-message.c:1772
+#: ../src/balsa-message.c:1788
 #, c-format
 msgid "Could not create URI for %s"
-msgstr "Ni mogoče ustvariti URI-ja za %s"
+msgstr "Ni mogoče ustvariti naslova URI za %s"
 
-#: ../src/balsa-message.c:1797
+#: ../src/balsa-message.c:1813
 #, c-format
 msgid "%s message part"
 msgstr "%s del sporočila"
 
-#: ../src/balsa-message.c:1830
-#: ../src/balsa-mime-widget-callbacks.c:165
+#: ../src/balsa-message.c:1846 ../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:2481
-#: ../src/balsa-message.c:2625
+#: ../src/balsa-message.c:2485 ../src/balsa-message.c:2626
 #, c-format
 msgid "Sending the disposition notification failed: %s"
 msgstr "Pošiljanje sporočila o prejetju je spodletelo: %s"
 
-#: ../src/balsa-message.c:2578
-#, c-format
+#: ../src/balsa-message.c:2582
+#, fuzzy, c-format
+#| msgid ""
+#| "The sender of this mail, %s, requested \n"
+#| "a Message Disposition Notification(MDN) to be returned to `%s'.\n"
+#| "Do you want to send this notification?"
 msgid ""
 "The sender of this mail, %s, requested \n"
-"a Message Disposition Notification(MDN) to be returned to `%s'.\n"
+"a Message Disposition Notification (MDN) to be returned to “%s”.\n"
 "Do you want to send this notification?"
 msgstr ""
 "Pošiljatelj tega sporočila, %s, je zahteval, da\n"
 "se obvestilo o prejetju sporočila vrne na naslov `%s'.\n"
 "Ali želite poslati to obvestilo?"
 
-#: ../src/balsa-message.c:2588
+#: ../src/balsa-message.c:2592
 msgid "Reply to MDN?"
 msgstr "Odgovori na obvestilo o prejetju sporočilca?"
 
-#: ../src/balsa-message.c:2799
+#: ../src/balsa-message.c:2802
 msgid ""
-"The decryption cannot be performed because this message is displayed more than once.\n"
+"The decryption cannot be performed because this message is displayed more "
+"than once.\n"
 "Please close the other instances of this message and try again."
 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:2820
-#: ../src/balsa-message.c:2905
-#: ../src/balsa-message.c:3027
+#: ../src/balsa-message.c:2823 ../src/balsa-message.c:2908
+#: ../src/balsa-message.c:3030
 #, c-format
 msgid "Parsing a message part failed: %s"
 msgstr "Razčlenjevanje dela sporočila ni uspelo: %s"
 
-#: ../src/balsa-message.c:2821
-#: ../src/balsa-message.c:2906
-#: ../src/balsa-message.c:3028
+#: ../src/balsa-message.c:2824 ../src/balsa-message.c:2909
+#: ../src/balsa-message.c:3031
 msgid "Possible disk space problem."
 msgstr "Mogoča je težava s prostorom na disku."
 
-#: ../src/balsa-message.c:2835
-#, c-format
-msgid "The message sent by %s with subject \"%s\" contains an encrypted part, but it's structure is invalid."
-msgstr "Sporočilo poslano od %s z zadevo \"%s\" vsebuje šifriran del, vendar je njihova struktura napačna."
-
-#: ../src/balsa-message.c:2843
-#, c-format
-msgid "The message sent by %s with subject \"%s\" contains a PGP encrypted part, but this crypto protocol is 
not available."
-msgstr "Sporočilo poslano od %s z zadevo \"%s\" vsebuje PGP šifriran del, vendar šifrirni protokol ni na 
voljo."
-
-#: ../src/balsa-message.c:2856
-#, c-format
-msgid "The message sent by %s with subject \"%s\" contains a S/MIME encrypted part, but this crypto protocol 
is not available."
-msgstr "Sporočilo poslano od %s z zadevo \"%s\" vsebuje S/MIME šifriran del, vendar šifrirni protokol ni na 
voljo."
-
-#: ../src/balsa-message.c:2923
-#, c-format
-msgid "The message sent by %s with subject \"%s\" contains a signed part, but its structure is invalid. The 
signature, if there is any, cannot be checked."
-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:2936
-#, c-format
-msgid "The message sent by %s with subject \"%s\" contains a %s signed part, but this crypto protocol is not 
available."
-msgstr "Sporočilo poslano od %s z zadevo  \"%s\" vsebuje podpisan del %s, vendar šifrirni protokol ni na 
voljo."
+#: ../src/balsa-message.c:2838
+#, fuzzy, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains an encrypted part, "
+#| "but it's structure is invalid."
+msgid ""
+"The message sent by %s with subject “%s” contains an encrypted part, but its "
+"structure is invalid."
+msgstr ""
+"Sporočilo poslano od %s z zadevo \"%s\" vsebuje šifriran del, vendar je "
+"njihova struktura napačna."
+
+#: ../src/balsa-message.c:2846
+#, fuzzy, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains a PGP encrypted part, "
+#| "but this crypto protocol is not available."
+msgid ""
+"The message sent by %s with subject “%s” contains a PGP encrypted part, but "
+"this crypto protocol is not available."
+msgstr ""
+"Sporočilo poslano od %s z zadevo \"%s\" vsebuje PGP šifriran del, vendar "
+"Å¡ifrirni protokol ni na voljo."
+
+#: ../src/balsa-message.c:2859
+#, fuzzy, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains a S/MIME encrypted "
+#| "part, but this crypto protocol is not available."
+msgid ""
+"The message sent by %s with subject “%s” contains a S/MIME encrypted part, "
+"but this crypto protocol is not available."
+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
+#, fuzzy, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains a signed part, but "
+#| "its structure is invalid. The signature, if there is any, cannot be "
+#| "checked."
+msgid ""
+"The message sent by %s with subject “%s” contains a signed part, but its "
+"structure is invalid. The signature, if there is any, cannot be checked."
+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
+#, fuzzy, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains a %s signed part, but "
+#| "this crypto protocol is not available."
+msgid ""
+"The message sent by %s with subject “%s” contains a %s signed part, but this "
+"crypto protocol is not available."
+msgstr ""
+"Sporočilo poslano od %s z zadevo  \"%s\" vsebuje podpisan del %s, vendar "
+"Å¡ifrirni protokol ni na voljo."
+
+#: ../src/balsa-message.c:2942
 msgid "PGP"
 msgstr "PGP"
 
-#: ../src/balsa-message.c:2939
-#: ../src/balsa-mime-widget-crypto.c:74
-#: ../src/print-gtk.c:194
+#: ../src/balsa-message.c:2942 ../src/print-gtk.c:199
 msgid "S/MIME"
 msgstr "S/MIME"
 
-#: ../src/balsa-message.c:2963
-#: ../src/balsa-message.c:3090
+#: ../src/balsa-message.c:2966 ../src/balsa-message.c:3093
 msgid "Detected a good signature"
 msgstr "Zaznan je dober podpis"
 
-#: ../src/balsa-message.c:2969
+#: ../src/balsa-message.c:2972
 msgid "Detected a good signature with insufficient validity"
 msgstr "Zaznan je dober podpis z nezadostno veljavnostjo"
 
-#: ../src/balsa-message.c:2974
-#: ../src/balsa-message.c:3094
+#: ../src/balsa-message.c:2977 ../src/balsa-message.c:3097
 msgid "Detected a good signature with insufficient validity/trust"
 msgstr "Zaznan je dober podpis z nezadostno veljavnostjo ali zaupanjem"
 
-#: ../src/balsa-message.c:2981
-#: ../src/balsa-message.c:3100
-#, c-format
+#: ../src/balsa-message.c:2984 ../src/balsa-message.c:3103
+#, fuzzy, c-format
+#| msgid ""
+#| "Checking the signature of the message sent by %s with subject \"%s\" "
+#| "returned:\n"
+#| "%s"
 msgid ""
-"Checking the signature of the message sent by %s with subject \"%s\" returned:\n"
+"Checking the signature of the message sent by %s with subject “%s” "
+"returned:\n"
 "%s"
 msgstr ""
 "Preverjanje podpisa sporočila od %s z zadevo \"%s\" je vrnilo:\n"
 "%s"
 
-#: ../src/balsa-message.c:2993
-#, c-format
-msgid "Checking the signature of the message sent by %s with subject \"%s\" failed with an error!"
-msgstr "Preverjanje podpisa sporočila od %s z zadevo \"%s\" je spodletelo z napako!"
-
-#: ../src/balsa-message.c:3052
-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:2996
+#, fuzzy, c-format
+#| msgid ""
+#| "Checking the signature of the message sent by %s with subject \"%s\" "
+#| "failed with an error!"
+msgid ""
+"Checking the signature of the message sent by %s with subject “%s” failed "
+"with an error!"
+msgstr ""
+"Preverjanje podpisa sporočila od %s z zadevo \"%s\" je spodletelo z napako!"
 
-#: ../src/balsa-message.c:3054
-msgid "The signature check and removal of the OpenPGP armor cannot be performed because this message is 
displayed more than once."
-msgstr "Ni mogoče preveriti podpisa in odstraniti oklepa OpenPGP, ker je to sporočilo prikazano več kot 
enkrat."
+#: ../src/balsa-message.c:3055
+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
+msgid ""
+"The signature check and removal of the OpenPGP armor cannot be performed "
+"because this message is displayed more than once."
+msgstr ""
+"Ni mogoče preveriti podpisa in odstraniti oklepa OpenPGP, ker je to "
+"sporočilo prikazano več kot enkrat."
+
+#: ../src/balsa-message.c:3060
 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-callbacks.c:54
-#: ../src/sendmsg-window.c:1799
+#: ../src/balsa-mime-widget.c:240 ../src/balsa-mime-widget-message.c:176
+#: ../src/balsa-mime-widget-message.c:222
+#, c-format
+msgid "File name: %s"
+msgstr "Ime datoteke: %s"
+
+#: ../src/balsa-mime-widget.c:256
+#, c-format
+msgid "Error reading message part: %s"
+msgstr "Napaka med branjem dela sporočila: %s"
+
+#: ../src/balsa-mime-widget.c:288
+#, c-format
+msgid "Type: %s (%s)"
+msgstr "Vrsta: %s (%s)"
+
+#: ../src/balsa-mime-widget.c:292
+#, c-format
+msgid "Content Type: %s"
+msgstr "Vrsta vsebine: %s"
+
+#: ../src/balsa-mime-widget.c:306
+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
+msgid "S_ave part"
+msgstr "_Shrani del"
+
+#: ../src/balsa-mime-widget-callbacks.c:52 ../src/sendmsg-window.c:1452
 #, c-format
 msgid "Could not launch application: %s"
 msgstr "Ni mogoče zagnati programa: %s"
 
-#: ../src/balsa-mime-widget-callbacks.c:81
+#: ../src/balsa-mime-widget-callbacks.c:79
 #, c-format
 msgid "Save %s MIME Part"
 msgstr "Shrani %s MIME del"
 
-#: ../src/balsa-mime-widget-callbacks.c:123
+#: ../src/balsa-mime-widget-callbacks.c:122
 #, c-format
-msgid "Could not construct uri from %s"
-msgstr "Uri-ja ni mogoče izgraditi iz %s "
+msgid "Could not construct URI from %s"
+msgstr "Naslova URI ni mogoče izgraditi iz %s "
 
-#: ../src/balsa-mime-widget-callbacks.c:142
+#: ../src/balsa-mime-widget-callbacks.c:141
 msgid "File already exists. Overwrite?"
 msgstr "Datoteka že obstaja. Ali naj bo prepisana?"
 
-#: ../src/balsa-mime-widget-callbacks.c:152
+#: ../src/balsa-mime-widget-callbacks.c:151
 #, c-format
 msgid "Unlink %s: %s"
 msgstr "Razveži %s: %s"
 
-#: ../src/balsa-mime-widget-crypto.c:72
-#, c-format
-msgid ""
-"This is an inline %s signed %s message part:\n"
-"%s"
-msgstr ""
-"Medvrstični %s podpisan %s del besedila:\n"
-"%s"
-
-#: ../src/balsa-mime-widget-crypto.c:74
-#: ../src/print-gtk.c:194
-msgid "OpenPGP"
-msgstr "OpenPGP"
-
-#: ../src/balsa-mime-widget-crypto.c:92
-msgid "_Run GnuPG to import this key"
-msgstr "_Zaženi GnuPG za uvoz tega ključa"
+#: ../src/balsa-mime-widget-crypto.c:93
+#, fuzzy
+msgid "_Search key server for this key"
+msgstr "Poišči ključe na strežniku ključev"
 
-#: ../src/balsa-mime-widget-crypto.c:96
-msgid "_Run GnuPG to check for an update of this key"
-msgstr "_Zaženi GnuPG za preverjanje, če obstaja posodobitev tega ključa"
+#: ../src/balsa-mime-widget-crypto.c:95
+#, 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:54
-#: ../src/balsa-mime-widget-image.c:178
+#: ../src/balsa-mime-widget-image.c:119 ../src/balsa-mime-widget-image.c:252
 #, c-format
 msgid "Error loading attached image: %s\n"
 msgstr "Napaka med nalaganjem priložene slike: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:161
-#: ../src/balsa-mime-widget-message.c:173
-#: ../src/balsa-mime-widget-message.c:201
-#: ../src/balsa-mime-widget-message.c:254
+#: ../src/balsa-mime-widget-message.c:144 ../src/balsa-print-object.c:113
+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
 msgid "Content Type: external-body\n"
 msgstr "Vrsta vsebine: zunanje-telo\n"
 
-#: ../src/balsa-mime-widget-message.c:162
+#: ../src/balsa-mime-widget-message.c:175
 #, c-format
 msgid "Access type: local-file\n"
 msgstr "Vrsta dostopa: krajevna-datoteka\n"
 
-#: ../src/balsa-mime-widget-message.c:163
-#: ../src/balsa-mime-widget-message.c:209
-#: ../src/balsa-mime-widget.c:233
-#, c-format
-msgid "File name: %s"
-msgstr "Ime datoteke: %s"
-
-#: ../src/balsa-mime-widget-message.c:174
+#: ../src/balsa-mime-widget-message.c:187
 #, c-format
 msgid "Access type: URL\n"
 msgstr "Vrsta dostopa: URL\n"
 
-#: ../src/balsa-mime-widget-message.c:175
+#: ../src/balsa-mime-widget-message.c:188
 #, c-format
 msgid "URL: %s"
 msgstr "URL: %s"
 
-#: ../src/balsa-mime-widget-message.c:202
+#: ../src/balsa-mime-widget-message.c:215
 #, c-format
 msgid "Access type: %s\n"
 msgstr "Vrsta dostopa: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:206
+#: ../src/balsa-mime-widget-message.c:219
 #, c-format
 msgid "FTP site: %s\n"
 msgstr "Stran FTP: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:208
+#: ../src/balsa-mime-widget-message.c:221
 #, c-format
 msgid "Directory: %s\n"
 msgstr "Mapa: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:255
+#: ../src/balsa-mime-widget-message.c:268
 msgid "Access type: mail-server\n"
 msgstr "Vrsta dostopa: poštni-strežnik\n"
 
-#: ../src/balsa-mime-widget-message.c:256
+#: ../src/balsa-mime-widget-message.c:269
 #, c-format
 msgid "Mail server: %s\n"
 msgstr "Poštni strežnik: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:258
+#: ../src/balsa-mime-widget-message.c:271
 #, c-format
 msgid "Subject: %s\n"
 msgstr "Zadeva: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:275
+#: ../src/balsa-mime-widget-message.c:288
 msgid "Se_nd message to obtain this part"
 msgstr "Pošlji _sporočilo za pridobitev tega dela"
 
-#: ../src/balsa-mime-widget-message.c:296
-#: ../src/balsa-mime-widget-text.c:804
-#: ../src/main-window.c:2684
-#: ../src/sendmsg-window.c:1820
+#: ../src/balsa-mime-widget-message.c:323 ../src/balsa-mime-widget-text.c:811
+#: ../src/sendmsg-window.c:1487
 #, c-format
 msgid "Error showing %s: %s\n"
 msgstr "Napaka med prikazovanjem %s: %s\n"
 
-#: ../src/balsa-mime-widget-message.c:331
+#: ../src/balsa-mime-widget-message.c:358
 #, c-format
 msgid "Could not get a part: %s"
 msgstr "Ni mogoče dobiti dela: %s"
 
-#: ../src/balsa-mime-widget-message.c:363
+#: ../src/balsa-mime-widget-message.c:386
 #, 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:450
-msgid "Reply..."
-msgstr "Odgovori ..."
-
-#: ../src/balsa-mime-widget-message.c:555
-msgid "... [truncated]"
-msgstr "... [skrajšano]"
+#: ../src/balsa-mime-widget-message.c:439
+#, fuzzy
+#| msgid "Reply"
+msgid "Reply…"
+msgstr "Odgovo_ri"
 
 #. Gmail sometimes fails to do that.
-#: ../src/balsa-mime-widget-message.c:705
+#: ../src/balsa-mime-widget-message.c:711
 msgid "Error:"
 msgstr "Napaka:"
 
-#: ../src/balsa-mime-widget-message.c:706
+#: ../src/balsa-mime-widget-message.c:712
 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:718
-#: ../src/balsa-print-object-header.c:155
-#: ../src/sendmsg-window.c:1138
-#: ../src/sendmsg-window.c:1140
-#: ../src/sendmsg-window.c:1231
-#: ../src/sendmsg-window.c:3795
-#: ../src/sendmsg-window.c:5702
+#: ../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
 msgid "Subject:"
 msgstr "Zadeva:"
 
-#: ../src/balsa-mime-widget-message.c:722
-#: ../src/balsa-print-object-header.c:163
-#: ../src/sendmsg-window.c:3791
+#: ../src/balsa-mime-widget-message.c:730
+#: ../src/balsa-print-object-header.c:164 ../src/sendmsg-window.c:3508
 msgid "Date:"
 msgstr "Datum:"
 
 #. addresses
-#: ../src/balsa-mime-widget-message.c:728
-#: ../src/balsa-print-object-header.c:168
-#: ../src/sendmsg-window.c:3802
-#: ../src/store-address.c:331
+#: ../src/balsa-mime-widget-message.c:736
+#: ../src/balsa-print-object-header.c:169 ../src/sendmsg-window.c:3519
 msgid "From:"
 msgstr "Od:"
 
-#: ../src/balsa-mime-widget-message.c:735
+#: ../src/balsa-mime-widget-message.c:743
 msgid "Reply-To:"
 msgstr "Odgovor-za:"
 
-#: ../src/balsa-mime-widget-message.c:744
-#: ../src/balsa-print-object-header.c:176
-msgid "Fcc:"
-msgstr "MKp:"
+#: ../src/balsa-mime-widget-message.c:756
+#: ../src/balsa-print-object-header.c:177
+msgid "FCC:"
+msgstr ""
 
-#: ../src/balsa-mime-widget-message.c:751
-#: ../src/balsa-print-object-header.c:179
+#: ../src/balsa-mime-widget-message.c:764
+#: ../src/balsa-print-object-header.c:180
 msgid "Disposition-Notification-To:"
 msgstr "Obvestilo-o-prejetju-na:"
 
-#: ../src/balsa-mime-widget-text.c:171
+#: ../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:515
+#: ../src/balsa-mime-widget-text.c:507
 msgid "Copy link"
 msgstr "Kopiraj povezavo"
 
-#: ../src/balsa-mime-widget-text.c:520
+#: ../src/balsa-mime-widget-text.c:512
 msgid "Open link"
 msgstr "Odpri povezavo"
 
-#: ../src/balsa-mime-widget-text.c:525
-msgid "Send link..."
-msgstr "Pošlji povezavo ..."
+#: ../src/balsa-mime-widget-text.c:517
+#, fuzzy
+#| msgid "Send link..."
+msgid "Send link…"
+msgstr "Povezava #"
 
-#: ../src/balsa-mime-widget-text.c:554
-#: ../src/balsa-mime-widget-text.c:1046
-msgid "Save..."
-msgstr "Shrani ..."
+#: ../src/balsa-mime-widget-text.c:548 ../src/balsa-mime-widget-text.c:1089
+#, fuzzy
+#| msgid "Save"
+msgid "Save…"
+msgstr "&Shrani"
 
-#: ../src/balsa-mime-widget-text.c:564
+#: ../src/balsa-mime-widget-text.c:558
 msgid "Highlight structured phrases"
 msgstr "Poudari oblikovana rekla"
 
-#: ../src/balsa-mime-widget-text.c:791
-#, c-format
-msgid "Calling URL %s..."
-msgstr "Klicanje naslova URL %s ..."
+#: ../src/balsa-mime-widget-text.c:789
+#, 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
+msgid "Zoom In"
+msgstr "Približaj"
+
+#: ../src/balsa-mime-widget-text.c:1061
+msgid "Zoom Out"
+msgstr "Oddalji"
+
+#: ../src/balsa-mime-widget-text.c:1066
+#, fuzzy
+#| msgid "Zoom _100%"
+msgid "Zoom 100%"
+msgstr "_Približaj na 100 %"
+
+#: ../src/balsa-mime-widget-text.c:1075
+msgid "Select _All"
+msgstr "Izberi _vse"
+
+#: ../src/balsa-mime-widget-text.c:1098
+#, fuzzy
+#| msgid "Print"
+msgid "Print…"
+msgstr "Natisni:"
+
+#: ../src/balsa-mime-widget-text.c:1236
+#, fuzzy
+#| msgid "Store Address"
+msgid "S_tore Address"
+msgstr "Naslov: %s"
+
+#: ../src/balsa-mime-widget-text.c:1243
+msgid "Full Name:"
+msgstr "Polno Ime:"
+
+#: ../src/balsa-mime-widget-text.c:1244
+#, fuzzy
+#| msgid "Nick Name"
+msgid "Nick Name:"
+msgstr "Vzdevek"
+
+#: ../src/balsa-mime-widget-text.c:1245
+#, fuzzy
+#| msgid "_First Name:"
+msgid "First Name:"
+msgstr "_Ime"
+
+#: ../src/balsa-mime-widget-text.c:1246
+#, fuzzy
+#| msgid "_Last Name:"
+msgid "Last Name:"
+msgstr "_Priimek"
+
+#: ../src/balsa-mime-widget-text.c:1247
+#, fuzzy
+#| msgid "O_rganization:"
+msgid "Organization:"
+msgstr "Organizacija"
+
+#: ../src/balsa-mime-widget-text.c:1249
+#, fuzzy
+#| msgid "_Email Address:"
+msgid "Email Address:"
+msgstr "Elektronski naslov:"
+
+#: ../src/balsa-mime-widget-text.c:1277
+#, fuzzy, c-format
+#| msgid ""
+#| "The message sent by %s with subject \"%s\" contains 8-bit characters, but "
+#| "no header describing the used codeset (converted to %s)"
+msgid ""
+"The message sent by %s with subject “%s” contains 8-bit characters, but no "
+"header describing the used codeset (converted to %s)"
+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
+#, 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
+msgid "Summary:"
+msgstr "Povzetek:"
+
+#: ../src/balsa-mime-widget-vcalendar.c:172
+#, fuzzy
+#| msgid "Organizer"
+msgid "Organizer:"
+msgstr "Organizator"
+
+#: ../src/balsa-mime-widget-vcalendar.c:173
+msgid "Start:"
+msgstr "Začetek:"
+
+#: ../src/balsa-mime-widget-vcalendar.c:174
+msgid "End:"
+msgstr "Konec:"
+
+#: ../src/balsa-mime-widget-vcalendar.c:175
+msgid "Location:"
+msgstr "Mesto:"
+
+#: ../src/balsa-mime-widget-vcalendar.c:207
+#, fuzzy
+#| msgid "Attendee"
+msgid "Attendee:"
+msgid_plural "Attendees:"
+msgstr[0] "Udeleženec"
+msgstr[1] "Udeleženec"
+msgstr[2] "Udeleženec"
+msgstr[3] "Udeleženec"
+
+#: ../src/balsa-mime-widget-vcalendar.c:211
+msgid "Description:"
+msgstr "Opis:"
+
+#: ../src/balsa-mime-widget-vcalendar.c:232
+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
+msgid "Accept"
+msgstr "Sprejmi"
+
+#: ../src/balsa-mime-widget-vcalendar.c:248
+msgid "Accept tentatively"
+msgstr "Poskusno sprejmi"
+
+#: ../src/balsa-mime-widget-vcalendar.c:256
+msgid "Decline"
+msgstr "Zavrni"
+
+#: ../src/balsa-mime-widget-vcalendar.c:303
+#, fuzzy
+#| msgid "iTip Calendar Request"
+msgid "iTIP Calendar Request"
+msgstr "Zahteva za overitev uporabe koledarja"
 
-#: ../src/balsa-mime-widget-text.c:1160
-msgid "Address"
-msgstr "Naslov"
+#: ../src/balsa-mime-widget-vcalendar.c:333
+#, 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-mime-widget-text.c:1163
-msgid "S_tore"
-msgstr "S_hrani"
+#: ../src/balsa-print-object-default.c:162
+#: ../src/balsa-print-object-default.c:166
+msgid "File name:"
+msgstr "Ime datoteke:"
 
-#: ../src/balsa-mime-widget-text.c:1171
-#: ../src/balsa-print-object-text.c:508
+#: ../src/balsa-print-object-text.c:491
 msgid "Full Name"
 msgstr "Polno ime"
 
-#: ../src/balsa-mime-widget-text.c:1172
-#: ../src/balsa-print-object-text.c:510
+#: ../src/balsa-print-object-text.c:493
 msgid "Nick Name"
 msgstr "Vzdevek"
 
-#: ../src/balsa-mime-widget-text.c:1173
-#: ../src/balsa-print-object-text.c:512
+#: ../src/balsa-print-object-text.c:495
 msgid "First Name"
 msgstr "Ime"
 
-#: ../src/balsa-mime-widget-text.c:1174
-#: ../src/balsa-print-object-text.c:514
+#: ../src/balsa-print-object-text.c:497
 msgid "Last Name"
 msgstr "Priimek"
 
-#: ../src/balsa-mime-widget-text.c:1175
-#: ../src/balsa-print-object-text.c:516
+#: ../src/balsa-print-object-text.c:499
 msgid "Organization"
 msgstr "Organizacija"
 
-#: ../src/balsa-mime-widget-text.c:1177
-#: ../src/balsa-print-object-text.c:519
-msgid "Email Address"
-msgstr "Elektronski naslov"
-
-#: ../src/balsa-mime-widget-text.c:1206
-#, c-format
-msgid "The message sent by %s with subject \"%s\" contains 8-bit characters, but no header describing the 
used codeset (converted to %s)"
-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:67
-#, c-format
-msgid "This is an iTIP calendar \"%s\" message."
-msgstr "To je sporočilo \"%s\" koledarja iTip."
-
-#: ../src/balsa-mime-widget-vcalendar.c:169
-#: ../src/balsa-print-object-text.c:665
+#: ../src/balsa-print-object-text.c:649
 msgid "Summary"
 msgstr "Povzetek"
 
-#: ../src/balsa-mime-widget-vcalendar.c:170
-#: ../src/balsa-print-object-text.c:667
+#: ../src/balsa-print-object-text.c:651
 msgid "Organizer"
 msgstr "Organizator"
 
-#: ../src/balsa-mime-widget-vcalendar.c:171
-#: ../src/balsa-print-object-text.c:669
+#: ../src/balsa-print-object-text.c:653
 msgid "Start"
 msgstr "Začetek"
 
-#: ../src/balsa-mime-widget-vcalendar.c:172
-#: ../src/balsa-print-object-text.c:671
+#: ../src/balsa-print-object-text.c:655
 msgid "End"
 msgstr "Konec"
 
-#: ../src/balsa-mime-widget-vcalendar.c:173
-#: ../src/balsa-print-object-text.c:673
+#: ../src/balsa-print-object-text.c:657
 msgid "Location"
 msgstr "Mesto"
 
-#: ../src/balsa-mime-widget-vcalendar.c:205
-#: ../src/balsa-print-object-text.c:682
+#: ../src/balsa-print-object-text.c:666
 msgid "Attendees"
 msgstr "Udeleženci"
 
-#: ../src/balsa-mime-widget-vcalendar.c:205
-#: ../src/balsa-print-object-text.c:682
+#: ../src/balsa-print-object-text.c:666
 msgid "Attendee"
 msgstr "Udeleženec"
 
-#: ../src/balsa-mime-widget-vcalendar.c:208
-#: ../src/balsa-print-object-text.c:696
-#: ../src/sendmsg-window.c:3008
+#: ../src/balsa-print-object-text.c:680 ../src/sendmsg-window.c:2711
 msgid "Description"
 msgstr "Opis"
 
-#: ../src/balsa-mime-widget-vcalendar.c:229
-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:236
-msgid "Accept"
-msgstr "Sprejmi"
-
-#: ../src/balsa-mime-widget-vcalendar.c:245
-msgid "Accept tentatively"
-msgstr "Poskusno sprejmi"
-
-#: ../src/balsa-mime-widget-vcalendar.c:253
-msgid "Decline"
-msgstr "Zavrni"
-
-#: ../src/balsa-mime-widget-vcalendar.c:300
-msgid "iTip Calendar Request"
-msgstr "Zahteva koledarja iTip"
-
-#: ../src/balsa-mime-widget-vcalendar.c:334
-#, c-format
-msgid "Sending the iTip calendar reply failed: %s"
-msgstr "Pošiljanje odgovora koledarja iTip je spodletelo: %s"
-
-#: ../src/balsa-mime-widget.c:252
-#, c-format
-msgid "Error reading message part: %s"
-msgstr "Napaka med branjem dela sporočila: %s"
-
-#: ../src/balsa-mime-widget.c:276
-#, c-format
-msgid "Type: %s (%s)"
-msgstr "Vrsta: %s (%s)"
-
-#: ../src/balsa-mime-widget.c:280
-#, c-format
-msgid "Content Type: %s"
-msgstr "Vrsta vsebine: %s"
-
-#: ../src/balsa-mime-widget.c:293
-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:298
-msgid "S_ave part"
-msgstr "_Shrani del"
-
-#: ../src/balsa-print-object-default.c:153
-#: ../src/balsa-print-object-default.c:155
-#: ../src/balsa-print-object-default.c:158
-msgid "Type:"
-msgstr "Vrsta:"
-
-#: ../src/balsa-print-object-default.c:163
-#: ../src/balsa-print-object-default.c:167
-msgid "File name:"
-msgstr "Ime datoteke:"
-
-#: ../src/filter-edit-callbacks.c:337
+#: ../src/filter-edit-callbacks.c:330
 msgid "One of the specified fields contains:"
 msgstr "Eno od navedenih polj vsebuje:"
 
-#: ../src/filter-edit-callbacks.c:338
+#: ../src/filter-edit-callbacks.c:331
 msgid "None of the specified fields contains:"
 msgstr "Nobeno od navedenih polj ne vsebuje:"
 
-#: ../src/filter-edit-callbacks.c:340
+#: ../src/filter-edit-callbacks.c:333
 msgid "One of the regular expressions matches"
 msgstr "Eden izmed logičnih izrazov se sklada"
 
-#: ../src/filter-edit-callbacks.c:341
+#: ../src/filter-edit-callbacks.c:334
 msgid "None of the regular expressions matches"
 msgstr "Noben logični izraz se ne sklada"
 
-#: ../src/filter-edit-callbacks.c:343
+#: ../src/filter-edit-callbacks.c:336
 msgid "Match when date is in the interval:"
 msgstr "Je skladno, ko je datum v intervalu:"
 
-#: ../src/filter-edit-callbacks.c:344
+#: ../src/filter-edit-callbacks.c:337
 msgid "Match when date is outside the interval:"
 msgstr "Je skladno, ko je datum izven intervala:"
 
-#: ../src/filter-edit-callbacks.c:346
-#: ../src/filter-edit-callbacks.c:1134
+#: ../src/filter-edit-callbacks.c:339 ../src/filter-edit-callbacks.c:1142
 msgid "Match when one of these flags is set:"
 msgstr "Je skladno, ko je nastavljena ena od teh zastavic:"
 
-#: ../src/filter-edit-callbacks.c:347
+#: ../src/filter-edit-callbacks.c:340
 msgid "Match when none of these flags is set:"
 msgstr "Je skladno, ko ni nastavljena nobena od teh zastavic:"
 
-#: ../src/filter-edit-callbacks.c:540
+#: ../src/filter-edit-callbacks.c:538
 msgid "You must specify the name of the user header to match on"
 msgstr "Navesti je treba ime uporabniške glave za določanje skladnosti"
 
-#: ../src/filter-edit-callbacks.c:551
+#: ../src/filter-edit-callbacks.c:549
 msgid "You must specify at least one field for matching"
 msgstr "Navesti je treba vsaj eno polje za določanje skladnosti"
 
-#: ../src/filter-edit-callbacks.c:561
+#: ../src/filter-edit-callbacks.c:559
 msgid "You must provide a string"
 msgstr "Navesti je treba niz"
 
-#: ../src/filter-edit-callbacks.c:569
+#: ../src/filter-edit-callbacks.c:567
 msgid "You must provide at least one regular expression"
 msgstr "Navesti je treba vsaj en logični izraz"
 
-#: ../src/filter-edit-callbacks.c:582
+#: ../src/filter-edit-callbacks.c:580
 msgid "Low date is incorrect"
 msgstr "Spodnja datumska meja je napačna"
 
-#: ../src/filter-edit-callbacks.c:593
+#: ../src/filter-edit-callbacks.c:591
 msgid "High date is incorrect"
 msgstr "Zgornja datumska meja je napačna"
 
-#: ../src/filter-edit-callbacks.c:601
+#: ../src/filter-edit-callbacks.c:599
 msgid "Low date is greater than high date"
 msgstr "Spodnja datumska meja je kasnejša od zgornje"
 
-#: ../src/filter-edit-callbacks.c:896
+#: ../src/filter-edit-callbacks.c:908
 #, c-format
 msgid "Error displaying condition help: %s\n"
 msgstr "Napaka ob prikazu pomoči pogojev %s\n"
 
-#: ../src/filter-edit-callbacks.c:937
+#: ../src/filter-edit-callbacks.c:946
 msgid "Match Fields"
 msgstr "Primerjaj skladnosti polj"
 
-#: ../src/filter-edit-callbacks.c:947
+#: ../src/filter-edit-callbacks.c:960
 msgid "_All"
 msgstr "_Vse"
 
-#: ../src/filter-edit-callbacks.c:948
+#: ../src/filter-edit-callbacks.c:961
 msgid "C_lear"
 msgstr "Po_čisti"
 
-#: ../src/filter-edit-callbacks.c:950
-#: ../src/main-window.c:4302
+#: ../src/filter-edit-callbacks.c:963 ../src/main-window.c:3954
 msgid "_Body"
 msgstr "_Telo"
 
-#: ../src/filter-edit-callbacks.c:951
-#: ../src/main-window.c:4303
+#: ../src/filter-edit-callbacks.c:964 ../src/main-window.c:3955
 msgid "_To:"
 msgstr "_Za:"
 
-#: ../src/filter-edit-callbacks.c:952
-#: ../src/main-window.c:4304
+#: ../src/filter-edit-callbacks.c:965 ../src/main-window.c:3956
 msgid "_From:"
 msgstr "_Od:"
 
-#: ../src/filter-edit-callbacks.c:953
+#: ../src/filter-edit-callbacks.c:966
 msgid "_Subject"
 msgstr "Z_adeva"
 
-#: ../src/filter-edit-callbacks.c:954
-#: ../src/main-window.c:4306
-msgid "_Cc:"
+#: ../src/filter-edit-callbacks.c:967 ../src/main-window.c:3958
+#, fuzzy
+msgid "_CC:"
 msgstr "_Kp:"
 
-#: ../src/filter-edit-callbacks.c:956
+#: ../src/filter-edit-callbacks.c:969
 msgid "_User header:"
 msgstr "Upo_rabniška glava:"
 
-#: ../src/filter-edit-callbacks.c:990
+#: ../src/filter-edit-callbacks.c:1000
 msgid "Unread"
 msgstr "Neprebrano"
 
-#: ../src/filter-edit-callbacks.c:990
-msgid "Deleted"
-msgstr "Izbrisano"
-
-#: ../src/filter-edit-callbacks.c:990
-msgid "Replied"
-msgstr "Odgovorjeno"
-
-#: ../src/filter-edit-callbacks.c:990
-msgid "Flagged"
-msgstr "Z zastavico"
-
-#: ../src/filter-edit-callbacks.c:1005
+#: ../src/filter-edit-callbacks.c:1019
 msgid "One of the specified f_ields contains"
 msgstr "Eno od navedenih _polj vsebuje:"
 
-#: ../src/filter-edit-callbacks.c:1020
+#: ../src/filter-edit-callbacks.c:1030
 msgid "Contain/Does _Not Contain"
 msgstr "Vsebuje/_Ne vsebuje"
 
-#: ../src/filter-edit-callbacks.c:1040
+#: ../src/filter-edit-callbacks.c:1049
 msgid "_One of the regular expressions matches"
 msgstr "_Eden od logičnih izrazov je skladen"
 
-#. Left/Remove button
-#: ../src/filter-edit-callbacks.c:1071
-#: ../src/filter-edit-dialog.c:330
-#: ../src/filter-run-dialog.c:334
-msgid "_Remove"
-msgstr "Od_strani"
-
-#: ../src/filter-edit-callbacks.c:1075
+#: ../src/filter-edit-callbacks.c:1085
 msgid "One _Matches/None Matches"
 msgstr "Eden je _skladen/Noben ni skladen"
 
-#: ../src/filter-edit-callbacks.c:1086
+#: ../src/filter-edit-callbacks.c:1096
 msgid "Filtering using regular expressions is not yet implemented."
 msgstr "Filtriranje z uporabo logičnih izrazov še ni podprto."
 
-#: ../src/filter-edit-callbacks.c:1096
+#: ../src/filter-edit-callbacks.c:1111
 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:1116
+#: ../src/filter-edit-callbacks.c:1124
 msgid "Inside/outside the date interval"
 msgstr "Znotraj/izven datumskega intervala"
 
-#: ../src/filter-edit-callbacks.c:1163
+#: ../src/filter-edit-callbacks.c:1165
 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"
+msgstr ""
+"Je skladno ko je nastavljena ena zastavica ali ko ni nastavljena nobena"
 
-#: ../src/filter-edit-callbacks.c:1182
+#: ../src/filter-edit-callbacks.c:1184
 msgid "Search T_ype:"
 msgstr "Vrsta _iskanja:"
 
-#: ../src/filter-edit-callbacks.c:1259
+#: ../src/filter-edit-callbacks.c:1262
 msgid "Edit condition for filter: "
 msgstr "Urejanje pogoja za filter: "
 
-#: ../src/filter-edit-callbacks.c:1477
-#: ../src/save-restore.c:1961
+#: ../src/filter-edit-callbacks.c:1483 ../src/save-restore.c:1885
 msgid "Filter with no condition was omitted"
 msgstr "Filter brez pogojev je bil izpuščen"
 
-#: ../src/filter-edit-callbacks.c:1503
+#: ../src/filter-edit-callbacks.c:1515
 #, c-format
 msgid "Error displaying filter help: %s\n"
 msgstr "Napaka med prikazovanjem pomoči filtra: %s\n"
 
-#: ../src/filter-edit-callbacks.c:1702
+#: ../src/filter-edit-callbacks.c:1714
 msgid "New filter"
 msgstr "Nov filter"
 
-#: ../src/filter-edit-callbacks.c:1831
+#: ../src/filter-edit-callbacks.c:1843
 msgid "No filter name specified."
 msgstr "Ime filtra ni podano."
 
-#: ../src/filter-edit-callbacks.c:1836
-#, c-format
-msgid "Filter \"%s\" already exists."
-msgstr "Filter \"%s\" že obstaja."
+#: ../src/filter-edit-callbacks.c:1848
+#, fuzzy, c-format
+#| msgid "Filter \"%s\" already exists."
+msgid "Filter “%s” already exists."
+msgstr "Mapa %s že obstaja"
 
-#: ../src/filter-edit-callbacks.c:1846
+#: ../src/filter-edit-callbacks.c:1858
 msgid "Filter must have conditions."
 msgstr "Filter mora vsebovati pogoje."
 
-#: ../src/filter-edit-callbacks.c:1932
+#: ../src/filter-edit-callbacks.c:1944
 msgid "Filter has matched"
 msgstr "Filter je izličil zadetke"
 
-#: ../src/filter-edit-callbacks.c:1952
+#: ../src/filter-edit-callbacks.c:1964
 msgid "You must provide a sound to play"
 msgstr "Treba je navesti zvok za predvajanje"
 
-#: ../src/filter-edit-callbacks.c:2130
+#: ../src/filter-edit-callbacks.c:2146
 #, c-format
 msgid "(Example: write December 31, 2000, as %s)"
 msgstr "(Primer: napiši 31. december 2000, kot %s)"
 
-#: ../src/filter-edit-dialog.c:97
-#: ../src/pref-manager.c:426
+#: ../src/filter-edit-dialog.c:95 ../src/pref-manager.c:226
 msgid "Simple"
 msgstr "Enostavno"
 
-#: ../src/filter-edit-dialog.c:98
+#: ../src/filter-edit-dialog.c:96
 msgid "Regular Expression"
 msgstr "Logični izraz"
 
-#: ../src/filter-edit-dialog.c:99
+#: ../src/filter-edit-dialog.c:97
 msgid "Date interval"
 msgstr "Datumski interval"
 
-#: ../src/filter-edit-dialog.c:100
+#: ../src/filter-edit-dialog.c:98
 msgid "Flag condition"
 msgstr "Pogoj zastavice"
 
-#: ../src/filter-edit-dialog.c:104
+#: ../src/filter-edit-dialog.c:102
 msgid "Copy to folder:"
 msgstr "Kopiraj v mapo:"
 
-#: ../src/filter-edit-dialog.c:105
+#: ../src/filter-edit-dialog.c:103
 msgid "Move to folder:"
 msgstr "Premakni v mapo:"
 
-#: ../src/filter-edit-dialog.c:106
+#: ../src/filter-edit-dialog.c:104
 msgid "Colorize"
 msgstr "Obarvaj"
 
-#: ../src/filter-edit-dialog.c:107
+#: ../src/filter-edit-dialog.c:105
 msgid "Print on printer:"
 msgstr "Natisni na tiskalniku:"
 
-#: ../src/filter-edit-dialog.c:108
+#: ../src/filter-edit-dialog.c:106
 msgid "Run program:"
 msgstr "Poženi program:"
 
-#: ../src/filter-edit-dialog.c:109
+#: ../src/filter-edit-dialog.c:107
 msgid "Send to Trash"
 msgstr "Pošlji v Smeti"
 
-#: ../src/filter-edit-dialog.c:113
+#: ../src/filter-edit-dialog.c:111
 msgid "OR"
 msgstr "ALI"
 
-#: ../src/filter-edit-dialog.c:114
+#: ../src/filter-edit-dialog.c:112
 msgid "AND"
 msgstr "IN"
 
@@ -3617,248 +4291,292 @@ msgid "_Filter name:"
 msgstr "Ime _filtra:"
 
 #. The filter op-code : "OR" or "AND" all the conditions
-#: ../src/filter-edit-dialog.c:276
-msgid "Operation between conditions"
-msgstr "Opravilo med pogoji"
+#: ../src/filter-edit-dialog.c:272
+#, fuzzy
+#| msgid "Operation between conditions"
+msgid "Operation between conditions:"
+msgstr "RAZMERE:"
 
-#: ../src/filter-edit-dialog.c:326
+#: ../src/filter-edit-dialog.c:309
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: ../src/filter-edit-dialog.c:314
 msgid "Ne_w"
 msgstr "No_v"
 
-#: ../src/filter-edit-dialog.c:354
+#: ../src/filter-edit-dialog.c:346
 msgid "Foreground"
 msgstr "Ospredje"
 
-#: ../src/filter-edit-dialog.c:365
+#: ../src/filter-edit-dialog.c:357
 msgid "Background"
 msgstr "Ozadje"
 
 #. The notification area
-#: ../src/filter-edit-dialog.c:390
+#: ../src/filter-edit-dialog.c:383
 msgid "Notification:"
 msgstr "Obvestilo:"
 
 #. Notification buttons
-#: ../src/filter-edit-dialog.c:400
+#: ../src/filter-edit-dialog.c:395
 msgid "Play sound:"
 msgstr "Predvajaj zvok:"
 
-#: ../src/filter-edit-dialog.c:406
-msgid "Use Sound..."
-msgstr "Uporabi zvok ..."
+#: ../src/filter-edit-dialog.c:400
+#, fuzzy
+#| msgid "Use Sound..."
+msgid "Use Sound…"
+msgstr "Uporabi zvočno temo"
 
-#: ../src/filter-edit-dialog.c:427
-msgid "Popup text:"
-msgstr "Pojavno besedilo:"
+#: ../src/filter-edit-dialog.c:403 ../src/mailbox-node.c:1111
+msgid "_Open"
+msgstr "_Odpri"
+
+#: ../src/filter-edit-dialog.c:418
+#, fuzzy
+#| msgid "Popup text:"
+msgid "Pop-up text:"
+msgstr "Pojavi okno opozorila"
 
 #. The action area
-#: ../src/filter-edit-dialog.c:448
+#: ../src/filter-edit-dialog.c:435
 msgid "Action to perform:"
 msgstr "Dejanje za izvedbo:"
 
-#: ../src/filter-edit-dialog.c:501
+#: ../src/filter-edit-dialog.c:489
 msgid "Match"
 msgstr "Se sklada"
 
-#: ../src/filter-edit-dialog.c:504
+#: ../src/filter-edit-dialog.c:492
 msgid "Action"
 msgstr "Dejanje"
 
-#: ../src/filter-edit-dialog.c:516
-msgid "Revert"
-msgstr "Povrni"
+#: ../src/filter-edit-dialog.c:503
+msgid "Re_vert"
+msgstr "Po&vrni"
 
-#: ../src/filter-edit-dialog.c:567
-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:554
+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:580
-msgid "Balsa Filters"
-msgstr "Balsini filtri"
+#: ../src/filter-edit-dialog.c:567
+msgid "Filters"
+msgstr "Filtri"
 
-#: ../src/filter-edit-dialog.c:649
-#, c-format
-msgid "Filter \"%s\" has no condition."
-msgstr "Filter \"%s\" ne vsebuje pogojev."
+#: ../src/filter-edit-dialog.c:635
+#, fuzzy, c-format
+#| msgid "Filter \"%s\" has no condition."
+msgid "Filter “%s” has no condition."
+msgstr "Spremeni pogoje filtriranja za %s"
 
-#: ../src/filter-export-callbacks.c:59
+#: ../src/filter-export-callbacks.c:57
 #, c-format
 msgid "Unable to export filter %s, an error occurred."
 msgstr "Ni mogoče izvoziti filtra %s, saj je prišlo do napake."
 
-#: ../src/filter-export-dialog.c:65
-msgid "There are opened filter run dialogs, close them before you can modify filters."
-msgstr "Pogovorna okna uporabe filtrov so odprta. Pred spreminjanjem filtrov jih je treba zapreti."
+#: ../src/filter-export-dialog.c:63
+msgid ""
+"There are opened filter run dialogs, close them before you can modify "
+"filters."
+msgstr ""
+"Pogovorna okna uporabe filtrov so odprta. Pred spreminjanjem filtrov jih je "
+"treba zapreti."
 
-#: ../src/filter-export-dialog.c:77
-msgid "Balsa Filters Export"
-msgstr "Izvoz Balsinih filtrov"
+#: ../src/filter-export-dialog.c:75
+#, fuzzy
+#| msgid "_Export Filters..."
+msgid "Export Filters"
+msgstr "_Izvozi"
 
-#: ../src/filter-run-callbacks.c:184
+#: ../src/filter-run-callbacks.c:192
 #, 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:234
-#: ../src/filter-run-callbacks.c:256
+#: ../src/filter-run-callbacks.c:242 ../src/filter-run-callbacks.c:264
 msgid "Error when applying filters"
 msgstr "Napaka med uveljavljanjem filtrov"
 
-#: ../src/filter-run-callbacks.c:237
-#: ../src/filter-run-callbacks.c:259
-#, c-format
-msgid "Filter applied to \"%s\"."
-msgstr "Filter je uveljavljen na \"%s\"."
+#: ../src/filter-run-callbacks.c:245 ../src/filter-run-callbacks.c:267
+#, fuzzy, c-format
+#| msgid "Filter applied to \"%s\"."
+msgid "Filter applied to “%s”."
+msgstr "Filtriranje po %s"
 
-#: ../src/filter-run-callbacks.c:298
-#, c-format
+#: ../src/filter-run-callbacks.c:306
+#, fuzzy, c-format
+#| msgid ""
+#| "The destination mailbox of the filter \"%s\" is \"%s\".\n"
+#| "You can't associate it with the same mailbox (that causes recursion)."
 msgid ""
-"The destination mailbox of the filter \"%s\" is \"%s\".\n"
-"You can't associate it with the same mailbox (that causes recursion)."
+"The destination mailbox of the filter “%s” is “%s”.\n"
+"You can’t associate it with the same mailbox (that causes recursion)."
 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:306
-#, c-format
+#: ../src/filter-run-callbacks.c:314
+#, fuzzy, c-format
+#| msgid ""
+#| "The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
+#| "This happens for example when you use regular expressions match with IMAP "
+#| "mailboxes, it is done by a very slow method; if possible, use substring "
+#| "match instead."
 msgid ""
-"The filter \"%s\" is not compatible with the mailbox type of \"%s\".\n"
-"This happens for example when you use regular expressions match with IMAP mailboxes, it is done by a very 
slow method; if possible, use substring match instead."
+"The filter “%s” is not compatible with the mailbox type of “%s”.\n"
+"This happens for example when you use regular expressions match with IMAP "
+"mailboxes, it is done by a very slow method; if possible, use substring "
+"match instead."
 msgstr ""
 "Filter \"%s\" je skladen s poštnim predalom vrste \"%s\".\n"
-"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."
+"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:191
-msgid "Balsa Filters of Mailbox: "
-msgstr "Balsini filtri poštnega predala: "
+#: ../src/filter-run-dialog.c:197
+#, 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:232
+#: ../src/filter-run-dialog.c:238
 msgid "On reception"
 msgstr "Ob sprejemu"
 
-#: ../src/filter-run-dialog.c:244
+#: ../src/filter-run-dialog.c:250
 msgid "On exit"
 msgstr "Ob izhodu"
 
-#: ../src/filter-run-dialog.c:318
-msgid "Apply Selected"
-msgstr "Uveljavi izbrano"
+#: ../src/filter-run-dialog.c:359
+#, fuzzy
+#| msgid "Apply Selected"
+msgid "_Apply Selected"
+msgstr "Uveljavi izbrano zaloge."
 
-#. up button
-#: ../src/filter-run-dialog.c:366
-msgid "_Up"
-msgstr "_Gor"
-
-#. down button
-#: ../src/filter-run-dialog.c:371
-msgid "Do_wn"
-msgstr "_Dol"
+#: ../src/filter-run-dialog.c:375
+#, fuzzy
+#| msgid "Edit the selected mailbox"
+msgid "Add selected filter to mailbox"
+msgstr "Ni izbranega poštnega predala."
 
-#: ../src/filter-run-dialog.c:377
+#: ../src/filter-run-dialog.c:385
+#, 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
+#, fuzzy
+#| msgid "Save selected to folder..."
+msgid "Move selected filter up"
+msgstr "Pomakni trenutno masko višje"
+
+#: ../src/filter-run-dialog.c:437
+#, fuzzy
+#| msgid "Save selected to folder..."
+msgid "Move selected filter down"
+msgstr "Pomakni trenutno masko nižje"
+
+#: ../src/filter-run-dialog.c:443
 msgid "A_pply Now!"
 msgstr "_Uveljavi takoj!"
 
-#: ../src/filter-run-dialog.c:421
-msgid "The filters dialog is opened, close it before you can run filters on any mailbox"
-msgstr "Pogovorno okno filtrov je odprto. Treba ga je zapreti, preden je mogoče zagnati filtre na 
kateremkoli predalu."
+#: ../src/filter-run-dialog.c:489
+msgid ""
+"The filters dialog is opened, close it before you can run filters on any "
+"mailbox"
+msgstr ""
+"Pogovorno okno filtrov je odprto. Treba ga je zapreti, preden je mogoče "
+"zagnati filtre na kateremkoli predalu."
 
-#: ../src/folder-conf.c:110
+#: ../src/folder-conf.c:117
 #, c-format
 msgid "Error displaying config help: %s\n"
 msgstr "Napaka med prikazovanjem pomoči nastavitev: %s\n"
 
-#: ../src/folder-conf.c:298
+#: ../src/folder-conf.c:306
 msgid "Remote IMAP folder"
 msgstr "Oddaljena mapa IMAP"
 
-#. must NOT be modal
-#: ../src/folder-conf.c:301
-#: ../src/folder-conf.c:789
-#: ../src/mailbox-conf.c:564
+#: ../src/folder-conf.c:310 ../src/folder-conf.c:805 ../src/mailbox-conf.c:608
 msgid "_Update"
 msgstr "Poso_dobi"
 
-#: ../src/folder-conf.c:301
+#: ../src/folder-conf.c:310
 msgid "C_reate"
 msgstr "Ustva_ri"
 
-#: ../src/folder-conf.c:327
-#: ../src/mailbox-conf.c:1218
-#: ../src/mailbox-conf.c:1330
-msgid "_Basic"
-msgstr "_Osnovno"
-
-#: ../src/folder-conf.c:332
+#: ../src/folder-conf.c:341
 msgid "_Max number of connections:"
 msgstr "_Največje število povezav:"
 
-#: ../src/folder-conf.c:339
-#: ../src/mailbox-conf.c:1393
+#: ../src/folder-conf.c:347 ../src/mailbox-conf.c:1451
 msgid "Enable _persistent cache"
 msgstr "Omogoči _vztrajni predpomnilnik"
 
-#: ../src/folder-conf.c:347
+#: ../src/folder-conf.c:354
 msgid "Use IDLE command"
 msgstr "Uporabi ukaz IDLE"
 
-#: ../src/folder-conf.c:354
-#: ../src/mailbox-conf.c:1397
+#: ../src/folder-conf.c:361 ../src/mailbox-conf.c:1454
 msgid "Enable _bug workarounds"
 msgstr "Omogoči _izmikanje hroščem"
 
-#: ../src/folder-conf.c:361
+#: ../src/folder-conf.c:368
 msgid "Use STATUS for mailbox checking"
 msgstr "Uporabi STATUS za preverjanje poštnega predala"
 
-#: ../src/folder-conf.c:367
-#: ../src/mailbox-conf.c:1272
-#: ../src/mailbox-conf.c:1399
-msgid "_Advanced"
-msgstr "_Napredno"
-
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:370
+#: ../src/folder-conf.c:377
 msgid "Descriptive _name:"
 msgstr "Opisno _ime:"
 
 #. username
-#: ../src/folder-conf.c:385
-#: ../src/mailbox-conf.c:1234
+#: ../src/folder-conf.c:392 ../src/mailbox-conf.c:1303
 msgid "Use_r name:"
 msgstr "Upo_rabniško ime:"
 
-#: ../src/folder-conf.c:391
+#: ../src/folder-conf.c:398
 msgid "_Password:"
 msgstr "_Geslo:"
 
-#: ../src/folder-conf.c:396
-#: ../src/mailbox-conf.c:1355
+#: ../src/folder-conf.c:405 ../src/mailbox-conf.c:1414
 msgid "_Anonymous access"
 msgstr "_Anonimni dostop"
 
-#: ../src/folder-conf.c:405
+#: ../src/folder-conf.c:416
 msgid "Subscribed _folders only"
 msgstr "Le _naročene mape"
 
-#: ../src/folder-conf.c:407
-msgid "Always show _INBOX"
-msgstr "_Vedno prikaži dohodni predal"
+#: ../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:410
+#: ../src/folder-conf.c:422
 msgid "Pr_efix:"
 msgstr "Predp_ona:"
 
-#: ../src/folder-conf.c:556
+#: ../src/folder-conf.c:569
 msgid "Select parent folder"
 msgstr "Izbor nadrejene mape"
 
-#: ../src/folder-conf.c:634
-#, c-format
+#: ../src/folder-conf.c:648
+#, fuzzy, c-format
+#| msgid ""
+#| "Renaming INBOX is special!\n"
+#| "You will create a subfolder %s in %s\n"
+#| "containing the messages from INBOX.\n"
+#| "INBOX and its subfolders will remain.\n"
+#| "What would you like to do?"
 msgid ""
-"Renaming INBOX is special!\n"
+"Renaming Inbox is special!\n"
 "You will create a subfolder %s in %s\n"
-"containing the messages from INBOX.\n"
-"INBOX and its subfolders will remain.\n"
+"containing the messages from Inbox.\n"
+"Inbox and its subfolders will remain.\n"
 "What would you like to do?"
 msgstr ""
 "Preimenovanje dohodnega predala je posebno!\n"
@@ -3867,29 +4585,31 @@ msgstr ""
 "Dohodni predal in podmape bodo ostali.\n"
 "Kaj želite narediti?"
 
-#: ../src/folder-conf.c:640
+#: ../src/folder-conf.c:655
 msgid "Question"
 msgstr "Vprašanje"
 
-#: ../src/folder-conf.c:645
-msgid "Rename INBOX"
-msgstr "Preimenuj dohodni predal"
+#: ../src/folder-conf.c:659
+#, fuzzy
+#| msgid "Rename INBOX"
+msgid "Rename Inbox"
+msgstr "_Dohodni predal:"
 
-#: ../src/folder-conf.c:647
+#: ../src/folder-conf.c:661
 msgid "Cancel"
 msgstr "Prekliči"
 
-#: ../src/folder-conf.c:672
+#: ../src/folder-conf.c:686
 #, c-format
 msgid "Folder rename failed. Reason: %s"
 msgstr "Preimenovanje mape ni uspelo. Vzrok: %s"
 
-#: ../src/folder-conf.c:724
+#: ../src/folder-conf.c:738
 #, c-format
 msgid "Folder creation failed. Reason: %s"
 msgstr "Ustvarjanje mape ni uspelo. Vzrok: %s"
 
-#: ../src/folder-conf.c:771
+#: ../src/folder-conf.c:785
 msgid ""
 "An IMAP folder that is not a mailbox\n"
 "has no properties that can be changed."
@@ -3897,68 +4617,70 @@ msgstr ""
 "Mapa IMAP, ki ni poštni predal nima\n"
 "lastnosti, ki bi jih bilo mogoče spremeniti."
 
-#: ../src/folder-conf.c:786
+#: ../src/folder-conf.c:801
 msgid "Remote IMAP subfolder"
 msgstr "Oddaljena podmapa IMAP"
 
-#: ../src/folder-conf.c:789
+#: ../src/folder-conf.c:805
 msgid "_Create"
 msgstr "_Ustvari"
 
-#: ../src/folder-conf.c:820
+#: ../src/folder-conf.c:835
 msgid "Create subfolder"
 msgstr "Ustvari podmapo"
 
 #. INPUT FIELD CREATION
-#: ../src/folder-conf.c:828
+#: ../src/folder-conf.c:843
 msgid "_Folder name:"
 msgstr "Ime _mape:"
 
-#: ../src/folder-conf.c:834
+#: ../src/folder-conf.c:849
 msgid "Host:"
 msgstr "Gostitelj:"
 
-#: ../src/folder-conf.c:843
+#: ../src/folder-conf.c:858
 msgid "Subfolder of:"
 msgstr "Podmapa od:"
 
-#: ../src/folder-conf.c:848
-msgid "_Browse..."
-msgstr "_Prebrskaj ..."
+#: ../src/folder-conf.c:863
+#, fuzzy
+#| msgid "_Browse..."
+msgid "_Browse…"
+msgstr "Pre_brskaj"
 
-#: ../src/folder-conf.c:862
+#: ../src/folder-conf.c:877
 msgid "read-only"
 msgstr "le za branje"
 
-#: ../src/folder-conf.c:863
+#: ../src/folder-conf.c:878
 msgid "read-write"
 msgstr "branje-pisanje"
 
-#: ../src/folder-conf.c:864
+#: ../src/folder-conf.c:879
 msgid "admin"
 msgstr "skrbnik"
 
-#: ../src/folder-conf.c:865
+#: ../src/folder-conf.c:880
 msgid "post"
 msgstr "pošlji"
 
-#: ../src/folder-conf.c:866
+#: ../src/folder-conf.c:881
 msgid "append"
 msgstr "pripni"
 
-#: ../src/folder-conf.c:867
+#: ../src/folder-conf.c:882
 msgid "delete"
 msgstr "izbriši"
 
-#: ../src/folder-conf.c:868
+#: ../src/folder-conf.c:883
 msgid "special"
 msgstr "posebno"
 
-#: ../src/folder-conf.c:874
+#: ../src/folder-conf.c:889
 msgid "Permissions:"
 msgstr "Dovoljenja:"
 
-#: ../src/folder-conf.c:881
+#: ../src/folder-conf.c:896
 msgid ""
 "\n"
 "detailed permissions are available only for open folders"
@@ -3966,95 +4688,129 @@ msgstr ""
 "\n"
 "podrobna dovoljena so na voljo le za odprte mape"
 
-#: ../src/folder-conf.c:888
+#: ../src/folder-conf.c:903
+#, fuzzy
+#| msgid ""
+#| "\n"
+#| "the server does not support ACL's"
 msgid ""
 "\n"
-"the server does not support ACL's"
-msgstr ""
-"\n"
-"strežnik ne podpira ACL-jev"
+"the server does not support ACLs"
+msgstr "Strežnik ne podpira protokola PLAIN"
 
-#: ../src/folder-conf.c:897
+#: ../src/folder-conf.c:912
 msgid "mine: "
 msgstr "lastno:"
 
-#: ../src/folder-conf.c:936
+#: ../src/folder-conf.c:950
 msgid "Quota:"
 msgstr "Omejitev prostora:"
 
-#: ../src/folder-conf.c:940
+#: ../src/folder-conf.c:954
 msgid "quota information available only for open folders"
 msgstr "podrobnosti o omejevanju prostora so na voljo le za odprte mape"
 
-#: ../src/folder-conf.c:945
+#: ../src/folder-conf.c:959
 msgid "the server does not support quotas"
 msgstr "strežnik ne podpira omejitve prostora"
 
-#: ../src/folder-conf.c:947
+#: ../src/folder-conf.c:961
 msgid "no limits"
 msgstr "brez omejitev"
 
-#: ../src/folder-conf.c:952
+#: ../src/folder-conf.c:966
 #, c-format
 msgid "%s of %s (%.1f%%) used"
 msgstr "%s od %s (%.1f%%) uporabljeno"
 
-#: ../src/folder-conf.c:989
-msgid "This folder is not stored in configuration. I do not yet know how to remove it from remote server."
-msgstr "Ta mapa ni shranjena v nastavitvah, zato je ni mogoče odstraniti z oddaljenega strežnika."
-
-#: ../src/folder-conf.c:998
-#, c-format
+#: ../src/folder-conf.c:1003
+msgid ""
+"This folder is not stored in configuration. I do not yet know how to remove "
+"it from remote server."
+msgstr ""
+"Ta mapa ni shranjena v nastavitvah, zato je ni mogoče odstraniti z "
+"oddaljenega strežnika."
+
+#: ../src/folder-conf.c:1012
+#, fuzzy, c-format
+#| msgid ""
+#| "This will remove the folder \"%s\" from the list.\n"
+#| "You may use \"New IMAP Folder\" later to add this folder again.\n"
 msgid ""
-"This will remove the folder \"%s\" from the list.\n"
-"You may use \"New IMAP Folder\" later to add this folder again.\n"
+"This will remove the folder “%s” from the list.\n"
+"You may use “New IMAP Folder” later to add this folder again.\n"
 msgstr ""
 "To bo odstranilo mapo \"%s\" s seznama.\n"
-"V primeru, da želite mapo kasneje ponovno dodati, lahko uporabite \"Nova mapa IMAP\".\n"
+"V primeru, da želite mapo kasneje ponovno dodati, lahko uporabite \"Nova "
+"mapa IMAP\".\n"
 
-#: ../src/folder-conf.c:1006
+#: ../src/folder-conf.c:1020
 msgid "Confirm"
 msgstr "Potrdi"
 
-#: ../src/information-dialog.c:232
-msgid "Information - Balsa"
-msgstr "Podrobnosti - Balsa"
+#: ../src/information-dialog.c:231
+#, fuzzy
+#| msgid "Information - Balsa"
+msgid "Information — Balsa"
+msgstr "Balsa"
+
+#: ../src/information-dialog.c:235 ../src/main-window.c:3975
+msgid "_Clear"
+msgstr "Po_čisti"
 
-#: ../src/information-dialog.c:359
+#: ../src/information-dialog.c:236
+#, fuzzy
+msgid "Cl_ose"
+msgstr "_Zapri brez shranjevanja"
+
+#: ../src/information-dialog.c:358
 #, c-format
 msgid "WARNING: "
 msgstr "OPOZORILO: "
 
-#: ../src/information-dialog.c:362
+#: ../src/information-dialog.c:361
 #, c-format
 msgid "ERROR: "
 msgstr "NAPAKA: "
 
-#: ../src/information-dialog.c:365
+#: ../src/information-dialog.c:364
 #, c-format
 msgid "FATAL: "
 msgstr "USODNA NAPAKA: "
 
-#: ../src/mailbox-conf.c:218
-msgid ""
-"Balsa was built without SSL support.\n"
-"Neither SSL nor TLS can be used."
-msgstr ""
-"Balsa je bila zgrajena brez podpore SSL.\n"
-"Uporabiti ni mogoče niti SSL niti TLS."
+#: ../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:230
+#: ../src/mailbox-conf.c:224
 msgid "Use _SSL"
 msgstr "Uporabi _SSL"
 
-#: ../src/mailbox-conf.c:365
+#: ../src/mailbox-conf.c:229
+msgid "Use _TLS:"
+msgstr "Uporabi _TLS:"
+
+#: ../src/mailbox-conf.c:408
 msgid "No mailbox selected."
 msgstr "Ni izbranega poštnega predala."
 
-#: ../src/mailbox-conf.c:395
-#, c-format
+#: ../src/mailbox-conf.c:438
+#, fuzzy, c-format
+#| msgid ""
+#| "Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
+#| "If you really want to remove it, assign its function\n"
+#| "to some other mailbox."
 msgid ""
-"Mailbox \"%s\" is used by Balsa and I cannot remove it.\n"
+"Mailbox “%s” is used by Balsa and I cannot remove it.\n"
 "If you really want to remove it, assign its function\n"
 "to some other mailbox."
 msgstr ""
@@ -4062,74 +4818,92 @@ msgstr ""
 "V primeru, da ga zares želite odstraniti, dodelite \n"
 "njegovo delovanje drugemu poštnemu predalu."
 
-#: ../src/mailbox-conf.c:405
-#, c-format
+#: ../src/mailbox-conf.c:448
+#, fuzzy, c-format
+#| msgid ""
+#| "This will remove the mailbox \"%s\" from the list of mailboxes.  You may "
+#| "also delete the disk file or files associated with this mailbox.\n"
+#| "If you do not remove the file on disk you may \"Add  Mailbox\" to access "
+#| "the mailbox again.\n"
+#| "What would you like to do?"
 msgid ""
-"This will remove the mailbox \"%s\" from the list of mailboxes.  You may also delete the disk file or files 
associated with this mailbox.\n"
-"If you do not remove the file on disk you may \"Add  Mailbox\" to access the mailbox again.\n"
+"This will remove the mailbox “%s” from the list of mailboxes. You may also "
+"delete the disk file or files associated with this mailbox.\n"
+"If you do not remove the file on disk you may “Add Mailbox” to access the "
+"mailbox again.\n"
 "What would you like to do?"
 msgstr ""
-"To bo odstranilo predal \"%s\" s seznama poštnih predalov. Mogoče je odstraniti tudi datoteko ali datoteke 
povezane s tem poštnim predalom.\n"
-"V primeru, da datoteke ne odstranite z diska, lahko kasneje za ponoven dostop do predala uporabite \"Dodaj 
poštni predal\".\n"
+"To bo odstranilo predal \"%s\" s seznama poštnih predalov. Mogoče je "
+"odstraniti tudi datoteko ali datoteke povezane s tem poštnim predalom.\n"
+"V primeru, da datoteke ne odstranite z diska, lahko kasneje za ponoven "
+"dostop do predala uporabite \"Dodaj poštni predal\".\n"
 "Kaj želite narediti?"
 
-#: ../src/mailbox-conf.c:417
+#: ../src/mailbox-conf.c:460
 msgid "Remove from _list"
 msgstr "Odstrani s _seznama"
 
-#: ../src/mailbox-conf.c:418
+#: ../src/mailbox-conf.c:461
 msgid "Remove from list and _disk"
 msgstr "Odstrani s seznama in z _diska"
 
-#: ../src/mailbox-conf.c:426
-#, c-format
+#: ../src/mailbox-conf.c:469
+#, fuzzy, c-format
+#| msgid ""
+#| "This will remove the mailbox \"%s\" and all its messages from your IMAP "
+#| "server.  If %s has subfolders, it will still appear as a node in the "
+#| "folder tree.\n"
+#| "You may use \"New IMAP subfolder\" later to add a mailbox with this "
+#| "name.\n"
+#| "What would you like to do?"
 msgid ""
-"This will remove the mailbox \"%s\" and all its messages from your IMAP server.  If %s has subfolders, it 
will still appear as a node in the folder tree.\n"
-"You may use \"New IMAP subfolder\" later to add a mailbox with this name.\n"
+"This will remove the mailbox “%s” and all its messages from your IMAP "
+"server. If %s has subfolders, it will still appear as a node in the folder "
+"tree.\n"
+"You may use “New IMAP subfolder” later to add a mailbox with this name.\n"
 "What would you like to do?"
 msgstr ""
 "To bo s strežnika IMAP odstranilo predal \"%s\" in vsa njegova sporočila.\n"
 "Če ima %s podmape, bodo še vedno vidno kot vozlišče v drevesu map.\n"
-"Kasneje lahko za dodajanje predalov s tem imenom uporabite \"Dodaj novo podmapo IMAP\".\n"
+"Kasneje lahko za dodajanje predalov s tem imenom uporabite \"Dodaj novo "
+"podmapo IMAP\".\n"
 "Kaj želite narediti?"
 
-#: ../src/mailbox-conf.c:439
+#: ../src/mailbox-conf.c:482
 msgid "_Remove from server"
 msgstr "_Odstrani s strežnika"
 
-#: ../src/mailbox-conf.c:446
-#, c-format
+#: ../src/mailbox-conf.c:489
+#, fuzzy, c-format
+#| msgid ""
+#| "This will remove the mailbox \"%s\" from the list of mailboxes.\n"
+#| "You may use \"Add Mailbox\" later to access this mailbox again.\n"
+#| "What would you like to do?"
 msgid ""
-"This will remove the mailbox \"%s\" from the list of mailboxes.\n"
-"You may use \"Add Mailbox\" later to access this mailbox again.\n"
+"This will remove the mailbox “%s” from the list of mailboxes.\n"
+"You may use “Add Mailbox” later to access this mailbox again.\n"
 "What would you like to do?"
 msgstr ""
 "To bo poštni predal \"%s\" odstranilo s seznama poštnih predalov.\n"
-"Za ponoven dostop do tega predala kasneje lahko uporabite \"Dodaj poštni predal\".\n"
+"Za ponoven dostop do tega predala kasneje lahko uporabite \"Dodaj poštni "
+"predal\".\n"
 "Kaj želite narediti?"
 
-#: ../src/mailbox-conf.c:455
+#: ../src/mailbox-conf.c:498
 msgid "_Remove from list"
 msgstr "_Odstrani s seznama"
 
-#: ../src/mailbox-conf.c:499
+#: ../src/mailbox-conf.c:542
 #, c-format
 msgid "Folder deletion failed. Reason: %s"
 msgstr "Brisanje mape ni uspelo. Vzrok: %s"
 
-#: ../src/mailbox-conf.c:568
-#: ../src/pref-manager.c:1712
-#: ../src/pref-manager.c:1784
-#: ../src/pref-manager.c:2962
-msgid "_Add"
-msgstr "_Dodaj"
-
-#: ../src/mailbox-conf.c:791
+#: ../src/mailbox-conf.c:879
 #, c-format
 msgid "%s on %s"
 msgstr "%s na %s"
 
-#: ../src/mailbox-conf.c:933
+#: ../src/mailbox-conf.c:1017
 #, c-format
 msgid ""
 "Rename of %s to %s failed:\n"
@@ -4138,75 +4912,84 @@ msgstr ""
 "Preimenovanje %s v %s ni uspelo:\n"
 "%s"
 
-#: ../src/mailbox-conf.c:1144
+#: ../src/mailbox-conf.c:1202
 msgid "_Mailbox Name:"
 msgstr "_Ime poštnega predala:"
 
-#: ../src/mailbox-conf.c:1153
+#: ../src/mailbox-conf.c:1211
 #, c-format
 msgid "Local %s Mailbox Properties"
 msgstr "Lastnosti krajevnega poštnega predala %s"
 
-#: ../src/mailbox-conf.c:1154
+#: ../src/mailbox-conf.c:1212
 #, c-format
 msgid "New Local %s Mailbox"
 msgstr "Nov krajevni poštni predal %s"
 
-#: ../src/mailbox-conf.c:1196
+#: ../src/mailbox-conf.c:1254
 msgid "Remote Mailbox Configurator"
 msgstr "Nastavitve oddaljenega poštnega predala"
 
 #. mailbox name
-#: ../src/mailbox-conf.c:1221
-#: ../src/mailbox-conf.c:1333
+#: ../src/mailbox-conf.c:1282 ../src/mailbox-conf.c:1394
 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:1240
-#: ../src/mailbox-conf.c:1367
+#: ../src/mailbox-conf.c:1308 ../src/mailbox-conf.c:1426
 msgid "Pass_word:"
 msgstr "_Geslo:"
 
-#: ../src/mailbox-conf.c:1248
+#: ../src/mailbox-conf.c:1314
 msgid "_Delete messages from server after download"
 msgstr "Po prejemu _izbriši sporočila s strežnika"
 
-#: ../src/mailbox-conf.c:1253
+#: ../src/mailbox-conf.c:1318
 msgid "_Enable check for new mail"
 msgstr "_Omogoči preverjanje za novo pošto"
 
-#: ../src/mailbox-conf.c:1258
+#: ../src/mailbox-conf.c:1322
 msgid "_Filter messages through procmail"
 msgstr "_Filtriraj sporočila skozi program procmail"
 
-#: ../src/mailbox-conf.c:1262
+#: ../src/mailbox-conf.c:1324
 msgid "Fi_lter Command:"
 msgstr "Ukaz fi_ltra:"
 
-#: ../src/mailbox-conf.c:1276
+#. toggle for apop
+#: ../src/mailbox-conf.c:1334
 msgid "Disable _APOP"
 msgstr "Onemogoči _APOP"
 
+#. toggle for enabling pipeling
+#: ../src/mailbox-conf.c:1336
+#, fuzzy
+msgid "Overlap commands"
+msgstr "Ukazi:\n"
+
 #. username
-#: ../src/mailbox-conf.c:1347
+#: ../src/mailbox-conf.c:1407
 msgid "_Username:"
 msgstr "_Uporabniško ime:"
 
-#: ../src/mailbox-conf.c:1372
+#: ../src/mailbox-conf.c:1431
 msgid "F_older path:"
 msgstr "_Pot mape:"
 
-#: ../src/mailbox-conf.c:1462
+#: ../src/mailbox-conf.c:1515
 msgid "_Identity:"
 msgstr "_Istovetnost:"
 
-#: ../src/mailbox-conf.c:1496
-#: ../src/pref-manager.c:3428
+#: ../src/mailbox-conf.c:1538 ../src/pref-manager.c:1154
 msgid "Always"
 msgstr "Vedno"
 
-#: ../src/mailbox-conf.c:1500
+#: ../src/mailbox-conf.c:1542
 msgid ""
 "_Decrypt and check\n"
 "signatures automatically:"
@@ -4214,24 +4997,27 @@ msgstr ""
 "_Dešifriraj in samodejno\n"
 "preveri podpise:"
 
-#: ../src/mailbox-conf.c:1527
+#: ../src/mailbox-conf.c:1569
 msgid "Show _Recipient column instead of Sender"
 msgstr "Pokaži stolpec _prejemnikov namesto pošiljatelja"
 
-#: ../src/mailbox-conf.c:1540
+#: ../src/mailbox-conf.c:1583
 msgid "_Subscribe for new mail check"
 msgstr "_Naroči se za novo preverjanje pošte"
 
-#: ../src/mailbox-node.c:316
+#: ../src/mailbox-node.c:317
 msgid "The folder edition to be written."
 msgstr "Izvod mape za zapisovanje."
 
-#: ../src/mailbox-node.c:491
-#, c-format
-msgid "Scanning %s. Please wait..."
-msgstr "Preiskovanje %s. Počakajte ..."
+#: ../src/mailbox-node.c:497
+#, fuzzy, c-format
+#| msgid "Scanning %s. Please wait..."
+msgid "Scanning %s. Please wait…"
+msgstr ""
+"Odklapljanje %s\n"
+"Počakajte trenutek ..."
 
-#: ../src/mailbox-node.c:507
+#: ../src/mailbox-node.c:513
 #, c-format
 msgid ""
 "Scanning of %s failed: %s\n"
@@ -4240,886 +5026,188 @@ msgstr ""
 "Preiskovanje %s ni uspelo: %s\n"
 "Preverite delovanje omrežja."
 
-#: ../src/mailbox-node.c:509
+#: ../src/mailbox-node.c:515
 #, c-format
 msgid "Scanning of %s failed: %s"
 msgstr "Preiskovanje %s ni uspelo: %s"
 
-#: ../src/mailbox-node.c:1046
-msgid "Local _mbox mailbox..."
-msgstr "Krajevni poštni predal _mbox ..."
-
-#: ../src/mailbox-node.c:1048
-msgid "Local Mail_dir mailbox..."
-msgstr "Krajevni poštni predal Mail_dir..."
-
-#: ../src/mailbox-node.c:1050
-msgid "Local M_H mailbox..."
-msgstr "Krajevni poštni predal M_H ..."
+#: ../src/mailbox-node.c:1063
+#, fuzzy
+#| msgid "Local _mbox mailbox..."
+msgid "Local _mbox mailbox…"
+msgstr "Poštni predal Berkeley (mbox)"
 
-#: ../src/mailbox-node.c:1052
-msgid "Remote _IMAP mailbox..."
-msgstr "Oddaljen poštni predal _IMAP ..."
+#: ../src/mailbox-node.c:1065
+#, fuzzy
+#| msgid "Local Mail_dir mailbox..."
+msgid "Local Mail_dir mailbox…"
+msgstr "Nov krajevni poštni predal %s"
 
-#: ../src/mailbox-node.c:1055
-msgid "Remote IMAP _folder..."
-msgstr "Oddaljena _mapa IMAP ..."
+#: ../src/mailbox-node.c:1067
+#, fuzzy
+#| msgid "Local M_H mailbox..."
+msgid "Local M_H mailbox…"
+msgstr "%A %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"
+msgid "Remote IMAP _folder…"
+msgstr "Oddaljena mapa IMAP"
 
-#: ../src/mailbox-node.c:1057
-msgid "Remote IMAP _subfolder..."
-msgstr "Oddaljena po_dmapa IMAP ..."
+#: ../src/mailbox-node.c:1074
+#, fuzzy
+#| msgid "Remote IMAP subfolder"
+msgid "Remote IMAP _subfolder…"
+msgstr "Oddaljena podmapa IMAP"
 
 #. clicked on the empty space
-#: ../src/mailbox-node.c:1068
-#: ../src/mailbox-node.c:1084
+#: ../src/mailbox-node.c:1085 ../src/mailbox-node.c:1101
 msgid "_Rescan"
 msgstr "Znova p_reišči"
 
-#: ../src/mailbox-node.c:1078
-#: ../src/main-window.c:485
-msgid "_Properties..."
-msgstr "_Lastnosti ..."
-
-#: ../src/mailbox-node.c:1094
-msgid "_Open"
-msgstr "_Odpri"
+#: ../src/mailbox-node.c:1095
+#, fuzzy
+#| msgid "_Properties"
+msgid "_Properties…"
+msgstr "_"
 
-#: ../src/mailbox-node.c:1108
+#: ../src/mailbox-node.c:1125
 msgid "_Subscribe"
 msgstr "_Naroči se"
 
-#: ../src/mailbox-node.c:1110
+#: ../src/mailbox-node.c:1127
 msgid "_Unsubscribe"
 msgstr "Pre_kliči naročnino"
 
-#: ../src/mailbox-node.c:1116
+#: ../src/mailbox-node.c:1133
 msgid "Mark as _Inbox"
 msgstr "Označi kot _dohodno pošto"
 
-#: ../src/mailbox-node.c:1118
+#: ../src/mailbox-node.c:1135
 msgid "_Mark as Sentbox"
 msgstr "Označi kot po_slano pošto"
 
-#: ../src/mailbox-node.c:1120
+#: ../src/mailbox-node.c:1137
 msgid "Mark as _Trash"
 msgstr "Označi kot s_meti"
 
-#: ../src/mailbox-node.c:1122
+#: ../src/mailbox-node.c:1139
 msgid "Mark as D_raftbox"
 msgstr "Označi kot osnu_tek"
 
-#: ../src/mailbox-node.c:1125
+#: ../src/mailbox-node.c:1142
 msgid "_Empty trash"
 msgstr "_Izprazni smeti"
 
-#: ../src/mailbox-node.c:1130
+#: ../src/mailbox-node.c:1147
 msgid "_Edit/Apply filters"
 msgstr "_Uredi/Uveljavi filtre"
 
-#: ../src/mailbox-node.c:1218
-#, c-format
-msgid "The path \"%s\" does not lead to a mailbox."
-msgstr "Pot \"%s\" ne vodi do poštnega predala."
+#: ../src/mailbox-node.c:1234
+#, 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:1231
+#: ../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:1262
+#: ../src/mailbox-node.c:1278
 #, c-format
 msgid "Local folder %s\n"
 msgstr "Krajevna mapa %s\n"
 
-#: ../src/main-window.c:322
-msgid "Balsa closes files and connections. Please wait..."
-msgstr "Balsa zapira datoteke in povezave. Počakajte ..."
+#: ../src/main.c:120 ../src/main.c:125 ../src/main.c:131 ../src/main.c:137
+#: ../src/main.c:143
+#, 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-window.c:347
-msgid "Mail_box"
-msgstr "Poš_tni predal"
-
-#: ../src/main-window.c:348
-#: ../src/message-window.c:243
-msgid "_Message"
-msgstr "_Sporočilo"
-
-#: ../src/main-window.c:349
-msgid "_Settings"
-msgstr "_Nastavitve"
-
-#: ../src/main-window.c:354
-msgid "Mail_boxes"
-msgstr "Poš_tni predali"
-
-#. Less frequently used entries of the 'View' menu
-#. Less frequently used entries of the 'Message' menu
-#. Less frequently used entries of the 'File' menu
-#. Less frequently used entries of the 'Edit' menu
-#. Less frequently used entries of the 'Tools' menu
-#: ../src/main-window.c:356
-#: ../src/main-window.c:361
-#: ../src/sendmsg-window.c:327
-#: ../src/sendmsg-window.c:329
-#: ../src/sendmsg-window.c:331
-msgid "_More"
-msgstr "_Več"
-
-#: ../src/main-window.c:357
-msgid "_Headers"
-msgstr "_Glave"
-
-#: ../src/main-window.c:358
-msgid "_Sort Mailbox"
-msgstr "_Razvrsti poštni predal"
-
-#: ../src/main-window.c:359
-msgid "H_ide messages"
-msgstr "S_krij sporočila"
-
-#: ../src/main-window.c:362
-#: ../src/sendmsg-window.c:325
-msgid "_Tools"
-msgstr "_Orodja"
-
-#: ../src/main-window.c:363
-msgid "_Filters"
-msgstr "_Filtri"
-
-#: ../src/main-window.c:364
-msgid "F_ilters"
-msgstr "F_iltri"
-
-#: ../src/main-window.c:365
-#: ../src/main-window.c:421
-msgid "Manage filters"
-msgstr "Upravljanje filtrov"
-
-#. File menu items
-#. Not in the touchpad menu, but still available as a toolbar
-#. * button:
-#: ../src/main-window.c:370
-msgid "_Continue"
-msgstr "N_adaljuj"
-
-#: ../src/main-window.c:371
-msgid "Continue editing current message"
-msgstr "Nadaljuje z urejanjem trenutnega sporočila"
-
-#: ../src/main-window.c:373
-msgid "_Get New Mail"
-msgstr "_Dobi novo pošto"
-
-#: ../src/main-window.c:374
-msgid "Fetch new incoming mail"
-msgstr "Pridobi novo prispelo pošto"
-
-#: ../src/main-window.c:375
-msgid "_Send Queued Mail"
-msgstr "_Pošlji pošto v čakalni vrsti"
-
-#: ../src/main-window.c:376
-msgid "Send messages from the outbox"
-msgstr "Pošlje sporočila iz odhodnega predala"
-
-#: ../src/main-window.c:379
-msgid "Send and _Receive Mail"
-msgstr "Pošlji in p_rejmi pošto"
-
-#: ../src/main-window.c:380
-msgid "Send and Receive messages"
-msgstr "Pošlje in prejme sporočila"
-
-#: ../src/main-window.c:382
-#: ../src/message-window.c:244
-#: ../src/sendmsg-window.c:344
-msgid "Page _Setup"
-msgstr "Nastavitev _strani"
-
-#: ../src/main-window.c:383
-#: ../src/message-window.c:245
-#: ../src/sendmsg-window.c:345
-msgid "Set up page for printing"
-msgstr "Nastavi stran za tiskanje"
-
-#: ../src/main-window.c:384
-msgid "_Address Book..."
-msgstr "_Imenik ..."
-
-#: ../src/main-window.c:385
-msgid "Open the address book"
-msgstr "Odpre imenik"
-
-#: ../src/main-window.c:386
-msgid "Quit Balsa"
-msgstr "Konča program"
-
-#. File:New submenu items
-#: ../src/main-window.c:389
-msgid "_Message..."
-msgstr "_Sporočilo ..."
-
-#: ../src/main-window.c:390
-msgid "Compose a new message"
-msgstr "Sestavi novo sporočilo"
-
-#: ../src/main-window.c:392
-msgid "Local mbox mailbox..."
-msgstr "Krajevni poštni predal mbox ..."
-
-#: ../src/main-window.c:393
-#: ../src/main-window.c:402
-msgid "Add a new mbox style mailbox"
-msgstr "Dodaj nov poštni predal v slogu mbox"
-
-#: ../src/main-window.c:395
-msgid "Local Maildir mailbox..."
-msgstr "Krajevni poštni predal Maildir ..."
-
-#: ../src/main-window.c:396
-#: ../src/main-window.c:405
-msgid "Add a new Maildir style mailbox"
-msgstr "Dodaj nov poštni predal oblike v slogu maildir"
-
-#: ../src/main-window.c:398
-msgid "Local MH mailbox..."
-msgstr "Krajevni poštni predal MH ..."
-
-#: ../src/main-window.c:399
-#: ../src/main-window.c:408
-msgid "Add a new MH style mailbox"
-msgstr "Doda nov poštni predal v slogu MH"
-
-#: ../src/main-window.c:401
-msgid "New mailbox..."
-msgstr "Nov poštni predal ..."
-
-#: ../src/main-window.c:404
-msgid "New \"Maildir\" mailbox..."
-msgstr "Nov poštni predal \"Maildir\" ..."
-
-#: ../src/main-window.c:407
-msgid "New \"MH\" mailbox..."
-msgstr "Nov poštni predal \"MH\" ..."
-
-#: ../src/main-window.c:410
-#: ../src/pref-manager.c:3281
-msgid "Remote IMAP mailbox..."
-msgstr "Oddaljen poštni predal IMAP ..."
-
-#: ../src/main-window.c:411
-msgid "Add a new IMAP mailbox"
-msgstr "Doda nov poštni predal IMAP"
-
-#: ../src/main-window.c:412
-#: ../src/pref-manager.c:3286
-msgid "Remote IMAP folder..."
-msgstr "Oddaljena mapa IMAP ..."
-
-#: ../src/main-window.c:413
-msgid "Add a new IMAP folder"
-msgstr "Doda novo mapo IMAP"
-
-#: ../src/main-window.c:414
-msgid "Remote IMAP subfolder..."
-msgstr "Oddaljena podmapa IMAP ..."
-
-#: ../src/main-window.c:415
-msgid "Add a new IMAP subfolder"
-msgstr "Doda novo podmapo IMAP"
-
-#: ../src/main-window.c:420
-msgid "F_ilters..."
-msgstr "_Filtri ..."
-
-#. Export selected filters to a text file.
-#: ../src/main-window.c:423
-msgid "_Export Filters..."
-msgstr "_Izvozi filtre ..."
-
-#: ../src/main-window.c:424
-msgid "Export filters as Sieve scripts"
-msgstr "Izvozi filtre kot skripte Sieve"
-
-#: ../src/main-window.c:425
-msgid "Prefere_nces"
-msgstr "Mož_nosti"
-
-#. View menu items
-#: ../src/main-window.c:428
-msgid "E_xpand All"
-msgstr "_Razširi vse"
-
-#: ../src/main-window.c:429
-msgid "Expand all threads"
-msgstr "Razširi vse niti"
-
-#: ../src/main-window.c:430
-msgid "_Collapse All"
-msgstr "_Zloži vse"
-
-#: ../src/main-window.c:431
-msgid "Collapse all expanded threads"
-msgstr "Zloži vse razširjene niti"
-
-#: ../src/main-window.c:433
-#: ../src/message-window.c:259
-msgid "Zoom _In"
-msgstr "_Približaj"
-
-#: ../src/main-window.c:434
-#: ../src/message-window.c:260
-msgid "Increase magnification"
-msgstr "Povečaj povečavo"
-
-#: ../src/main-window.c:435
-#: ../src/message-window.c:261
-msgid "Zoom _Out"
-msgstr "_Oddalji"
-
-#: ../src/main-window.c:436
-#: ../src/message-window.c:262
-msgid "Decrease magnification"
-msgstr "Zmanjšaj povečavo"
-
-#. To warn msgfmt that the % sign isn't a format specifier:
-#: ../src/main-window.c:439
-#: ../src/message-window.c:265
-#, no-c-format
-msgid "Zoom _100%"
-msgstr "Približaj _100%"
-
-#: ../src/main-window.c:440
-#: ../src/message-window.c:266
-msgid "No magnification"
-msgstr "Brez povečave"
-
-#. Mailbox menu item that does not require a mailbox
-#: ../src/main-window.c:443
-#: ../src/main-window.c:444
-#: ../src/message-window.c:300
-#: ../src/message-window.c:301
-msgid "Next Unread Message"
-msgstr "Naslednje neprebrano sporočilo"
-
-#: ../src/main-window.c:446
-msgid "Empty _Trash"
-msgstr "Izprazni _Smeti"
-
-#: ../src/main-window.c:447
-msgid "Delete messages from the Trash mailbox"
-msgstr "Izbriše sporočila iz poštnega predala Smeti"
-
-#. Settings menu items
-#: ../src/main-window.c:450
-msgid "_Toolbars..."
-msgstr "_Orodne vrstice ..."
+#: ../src/main.c:120
+msgid "Inbox"
+msgstr "Dohodni predal"
 
-#: ../src/main-window.c:451
-msgid "Customize toolbars"
-msgstr "Prilagodi orodne vrstice"
+#: ../src/main.c:126
+msgid "Outbox"
+msgstr "Odhodni predal"
 
-#: ../src/main-window.c:452
-msgid "_Identities..."
-msgstr "_Istovetnosti ..."
+#: ../src/main.c:132
+msgid "Sentbox"
+msgstr "Poslana pošta"
 
-#: ../src/main-window.c:453
-msgid "Create and set current identities"
-msgstr "Ustvari in nastavi trenutne istovetnosti"
+#: ../src/main.c:138
+msgid "Draftbox"
+msgstr "Predal osnutkov"
 
-#. Help menu items
-#: ../src/main-window.c:456
-msgid "_Contents"
-msgstr "_Vsebina"
+#: ../src/main.c:143
+msgid "Trash"
+msgstr "Smeti"
 
-#: ../src/main-window.c:457
-msgid "Table of Contents"
-msgstr "Kazalo vsebine"
+#: ../src/main.c:384
+#, fuzzy
+#| msgid "Compressing mail folders..."
+msgid "Compressing mail folders…"
+msgstr "Napaka med stiskanjem datoteke %s"
 
-#. license ?
-#: ../src/main-window.c:458
-#: ../src/main-window.c:2723
-msgid "About Balsa"
-msgstr "O programu"
+#: ../src/main.c:648
+#, fuzzy
+#| msgid "Get new mail on startup"
+msgid "Get new mail on start-up"
+msgstr "Ni mogoče začeti novega prijavnega zaslona."
 
-#. Edit menu items
-#: ../src/main-window.c:465
-#: ../src/message-window.c:253
-#: ../src/sendmsg-window.c:361
-msgid "Select _All"
-msgstr "Izberi _vse"
+#: ../src/main.c:650
+msgid "Compose a new email to EMAIL@ADDRESS"
+msgstr "Sestavi novo elektronsko pošto za ELEKTRONSKI@NASLOV"
 
-#: ../src/main-window.c:467
-msgid "_Find"
-msgstr "_Poišči"
+#: ../src/main.c:652
+msgid "Attach file at URI"
+msgstr "Priloži datoteko na URI"
 
-#: ../src/main-window.c:469
-msgid "Find Ne_xt"
-msgstr "Poišči _naslednje"
+#: ../src/main.c:655
+msgid "Opens MAILBOXNAME"
+msgstr "Odpre ImePoštnegaPredala"
 
-#. Mailbox menu items
-#: ../src/main-window.c:472
-#: ../src/main-window.c:473
-#: ../src/message-window.c:298
-#: ../src/message-window.c:299
-msgid "Next Message"
-msgstr "Naslednje sporočilo"
+#: ../src/main.c:655
+msgid "MAILBOXNAME"
+msgstr "ImePoštnegaPredala"
 
-#: ../src/main-window.c:474
-#: ../src/main-window.c:475
-#: ../src/message-window.c:303
-#: ../src/message-window.c:304
-msgid "Previous Message"
-msgstr "Predhodno sporočilo"
-
-#: ../src/main-window.c:476
-#: ../src/main-window.c:477
-#: ../src/message-window.c:305
-#: ../src/message-window.c:306
-msgid "Next Flagged Message"
-msgstr "Naslednje sporočilo z zastavico"
-
-#: ../src/main-window.c:479
-msgid "_Hide Messages"
-msgstr "_Skrij sporočila"
-
-#: ../src/main-window.c:480
-msgid "_Reset Filter"
-msgstr "_Ponastavi filter"
-
-#: ../src/main-window.c:481
-msgid "Reset mailbox filter"
-msgstr "Ponastavi filter poštnega predala"
-
-#: ../src/main-window.c:482
-msgid "_Select All"
-msgstr "_Izberi vse"
-
-#: ../src/main-window.c:483
-msgid "Select all messages in current mailbox"
-msgstr "Izbere vsa sporočila v trenutnem poštnem predalu"
-
-#: ../src/main-window.c:486
-msgid "Edit the selected mailbox"
-msgstr "Uredi izbran poštni predal"
-
-#: ../src/main-window.c:487
-msgid "_Delete..."
-msgstr "_Izbriši ..."
-
-#: ../src/main-window.c:488
-msgid "Delete the selected mailbox"
-msgstr "Izbriše izbran poštni predal"
-
-#: ../src/main-window.c:491
-#: ../src/main-window.c:494
-msgid "E_xpunge Deleted Messages"
-msgstr "_Uniči izbrisana sporočila "
-
-#: ../src/main-window.c:492
-#: ../src/main-window.c:495
-msgid "Expunge messages marked as deleted in the current mailbox"
-msgstr "Uniči sporočila označena kot izbrisana v trenutnem poštnem predalu"
-
-#: ../src/main-window.c:498
-msgid "Close mailbox"
-msgstr "Zapri poštni predal"
-
-#: ../src/main-window.c:500
-msgid "Select _Filters"
-msgstr "Izberi _filtre"
-
-#: ../src/main-window.c:501
-msgid "Select filters to be applied automatically to current mailbox"
-msgstr "Izberite filtre za samodejno uveljavitev v trenutnem poštnem predalu"
-
-#: ../src/main-window.c:504
-msgid "_Remove Duplicates"
-msgstr "_Odstrani dvojnike"
-
-#: ../src/main-window.c:505
-msgid "Remove duplicated messages from the current mailbox"
-msgstr "Odstrani podvojena sporočila iz trenutnega poštnega predala"
-
-#: ../src/main-window.c:515
-#: ../src/message-window.c:269
-msgid "Reply to the current message"
-msgstr "Odgovori na trenutno sporočilo"
-
-#: ../src/main-window.c:516
-#: ../src/message-window.c:270
-msgid "Reply to _All..."
-msgstr "Odgovori _vsem ..."
-
-#: ../src/main-window.c:517
-#: ../src/message-window.c:271
-msgid "Reply to all recipients of the current message"
-msgstr "Odgovori vsem prejemnikom trenutnega sporočila"
-
-#: ../src/main-window.c:519
-#: ../src/message-window.c:273
-msgid "Reply to _Group..."
-msgstr "Odgovori _skupini ..."
-
-#: ../src/main-window.c:520
-#: ../src/message-window.c:274
-msgid "Reply to mailing list"
-msgstr "Odgovori na poštni seznam"
-
-#: ../src/main-window.c:522
-msgid "Store address of sender in addressbook"
-msgstr "Shrani naslov pošiljatelja v imenik"
-
-#: ../src/main-window.c:524
-#: ../src/message-window.c:278
-msgid "_View Source..."
-msgstr "_Ogled izvora ..."
-
-#: ../src/main-window.c:525
-#: ../src/message-window.c:279
-msgid "View source form of the message"
-msgstr "Pogled izvorno obliko sporočila"
-
-#. All three "Forward" actions and the "Pipe" action have the same
-#. * stock_id; the first in this list defines the action tied to the
-#. * toolbar's Forward button, so "ForwardDefault" must come before
-#. * the others.
-#: ../src/main-window.c:531
-msgid "_Forward..."
-msgstr "_Posreduj ..."
-
-#: ../src/main-window.c:532
-#: ../src/message-window.c:285
-msgid "Forward the current message"
-msgstr "Posreduje trenutno sporočilo"
-
-#: ../src/main-window.c:535
-#: ../src/message-window.c:287
-msgid "_Forward attached..."
-msgstr "_Posreduj priloženo ..."
-
-#: ../src/main-window.c:536
-#: ../src/message-window.c:288
-msgid "Forward the current message as attachment"
-msgstr "Posreduje trenutno sporočilo kot prilogo"
-
-#: ../src/main-window.c:538
-#: ../src/message-window.c:290
-msgid "Forward _inline..."
-msgstr "Posreduj _medvrstično ..."
-
-#: ../src/main-window.c:539
-#: ../src/message-window.c:291
-msgid "Forward the current message inline"
-msgstr "Posreduje trenutno sporočilo medvrstično"
-
-#: ../src/main-window.c:542
-msgid "Pipe the message through another program"
-msgstr "Pošlji sporočilo preko drugega programa"
-
-#: ../src/main-window.c:544
-msgid "Select _Thread"
-msgstr "Izberi _nit"
-
-#: ../src/main-window.c:545
-msgid "Select all messages in current thread"
-msgstr "Izbere vsa sporočila v trenutni niti"
-
-#. File menu item
-#: ../src/main-window.c:553
-#: ../src/message-window.c:246
-#: ../src/sendmsg-window.c:347
-msgid "_Print..."
-msgstr "_Natisni ..."
-
-#: ../src/main-window.c:554
-#: ../src/message-window.c:247
-msgid "Print current message"
-msgstr "Natisne trenutno sporočilo"
-
-#: ../src/main-window.c:555
-#: ../src/message-window.c:275
-msgid "Save Current Part..."
-msgstr "Shrani trenutni del ..."
-
-#: ../src/main-window.c:556
-#: ../src/message-window.c:276
-msgid "Save currently displayed part of message"
-msgstr "Shrani trenutno prikazan del sporočila"
-
-#: ../src/main-window.c:559
-#: ../src/message-window.c:293
-msgid "_Next Part"
-msgstr "_Naslednji del"
-
-#: ../src/main-window.c:560
-#: ../src/message-window.c:294
-msgid "Next part in message"
-msgstr "Naslednji del sporočila"
-
-#: ../src/main-window.c:561
-#: ../src/message-window.c:295
-msgid "_Previous Part"
-msgstr "_Predhodni del"
-
-#: ../src/main-window.c:562
-#: ../src/message-window.c:296
-msgid "Previous part in message"
-msgstr "Predhodni del sporočila"
-
-#: ../src/main-window.c:565
-msgid "Copy message"
-msgstr "Kopiraj sporočilo"
-
-#: ../src/main-window.c:568
-msgid "Find in _Message"
-msgstr "_Najdi v sporočilu"
-
-#: ../src/main-window.c:569
-#: ../src/message-window.c:256
-msgid "Find a string in this message"
-msgstr "Najdi niz v tem sporočilu"
-
-#: ../src/main-window.c:579
-#: ../src/message-window.c:308
-msgid "_Move to Trash"
-msgstr "_Prestavi v Smeti"
-
-#: ../src/main-window.c:580
-#: ../src/main-window.c:584
-msgid "Move the current message to Trash mailbox"
-msgstr "Premakne trenutno sporočilo v poštni predal Smeti"
-
-#: ../src/main-window.c:583
-msgid "_Delete to Trash"
-msgstr "_Premakni v smeti"
-
-#: ../src/main-window.c:587
-#: ../src/main-window.c:596
-msgid "Toggle New"
-msgstr "Preklopi novo"
-
-#: ../src/main-window.c:589
-msgid "_Toggle Flag"
-msgstr "_Preklopi zastavico"
-
-#: ../src/main-window.c:592
-msgid "Toggle flagged"
-msgstr "Preklopi zastavico"
-
-#. Hide messages menu items
-#: ../src/main-window.c:593
-#: ../src/main-window.c:628
-msgid "_Deleted"
-msgstr "_Izbrisano"
-
-#: ../src/main-window.c:594
-msgid "Toggle deleted flag"
-msgstr "Preklopi zastavice izbrisanih sporočil"
-
-#: ../src/main-window.c:597
-#: ../src/main-window.c:640
-msgid "_Answered"
-msgstr "_Odgovorjeno"
-
-#: ../src/main-window.c:598
-msgid "Toggle Answered"
-msgstr "Preklopi odgovorjeno"
-
-#: ../src/main-window.c:605
-msgid "_Show Mailbox Tree"
-msgstr "_Pokaži drevo poštnih predalov"
-
-#: ../src/main-window.c:606
-msgid "Toggle display of mailbox and folder tree"
-msgstr "Preklopi prikaz poštnega predala in drevesa map"
-
-#: ../src/main-window.c:608
-msgid "Show Mailbox _Tabs"
-msgstr "Pokaži z_avihke poštnih predalov"
-
-#: ../src/main-window.c:609
-msgid "Toggle display of mailbox notebook tabs"
-msgstr "Preklopi prikaz zavihkov beležke poštnega predala"
-
-#: ../src/main-window.c:611
-#: ../src/message-window.c:315
-msgid "Show Too_lbar"
-msgstr "Pokaži o_rodno vrstico"
-
-#: ../src/main-window.c:613
-msgid "Show St_atus Bar"
-msgstr "Pokaži vrstico s_tanja"
-
-#: ../src/main-window.c:615
-msgid "Show _Index Filter"
-msgstr "Pokaži filter _kazala"
-
-#: ../src/main-window.c:618
-msgid "_Descending"
-msgstr "_Padajoče"
-
-#: ../src/main-window.c:619
-msgid "Sort in a descending order"
-msgstr "Razvrsti padajoče"
-
-#: ../src/main-window.c:621
-msgid "_View filter"
-msgstr "Filter _pogleda"
-
-#: ../src/main-window.c:622
-msgid "Enable quick message index filter"
-msgstr "Omogoči hiter filter kazala sporočila"
-
-#: ../src/main-window.c:625
-#: ../src/message-window.c:317
-msgid "_Wrap"
-msgstr "_Prelomi"
-
-#: ../src/main-window.c:625
-#: ../src/message-window.c:317
-#: ../src/sendmsg-window.c:364
-msgid "Wrap message lines"
-msgstr "Prelomi vrstice sporočila"
-
-#: ../src/main-window.c:630
-msgid "Un_Deleted"
-msgstr "_Povrnjeno"
-
-#: ../src/main-window.c:632
-msgid "_Read"
-msgstr "P_rebrano"
-
-#: ../src/main-window.c:634
-msgid "Un_read"
-msgstr "N_eprebrano"
+#: ../src/main.c:658
+msgid "Opens first unread mailbox"
+msgstr "Odpre prvi neprebran poštni predal"
 
-#: ../src/main-window.c:638
-msgid "Un_flagged"
-msgstr "_Brez zastavic"
+#: ../src/main.c:661
+#, 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-window.c:642
-msgid "Un_answered"
-msgstr "_Neodgovorjeno"
+#: ../src/main.c:664
+msgid "Prints number unread and unsent messages"
+msgstr "Izpiše število neprebranih in neposlanih sporočil"
 
-#. Toolbar items not on any menu
-#: ../src/main-window.c:645
-#: ../src/toolbar-factory.c:161
-msgid ""
-"All\n"
-"headers"
-msgstr ""
-"Vse\n"
-"glave"
+#: ../src/main.c:666
+msgid "Debug IMAP connection"
+msgstr "Razhroščevanje povezave IMAP"
 
-#: ../src/main-window.c:646
-#: ../src/message-window.c:320
-msgid "Show all headers"
-msgstr "Pokaže vse glave"
+#: ../src/main.c:667
+msgid "Show help options"
+msgstr "Pokaži možnosti pomoči"
 
-#: ../src/main-window.c:648
-#: ../src/toolbar-factory.c:163
-msgid "Msg Preview"
-msgstr "Predogled sporočila"
-
-#: ../src/main-window.c:649
-msgid "Show preview pane"
-msgstr "Pokaži pladenj predogleda"
-
-#: ../src/main-window.c:655
-#: ../src/message-window.c:326
-msgid "_No Headers"
-msgstr "_Brez glav"
-
-#: ../src/main-window.c:656
-#: ../src/message-window.c:327
-msgid "Display no headers"
-msgstr "Ne pokaži glav"
-
-#: ../src/main-window.c:657
-msgid "S_elected Headers"
-msgstr "_Izbrane glave"
-
-#: ../src/main-window.c:658
-#: ../src/message-window.c:329
-msgid "Display selected headers"
-msgstr "Pokaže izbrane glave"
-
-#: ../src/main-window.c:659
-#: ../src/message-window.c:330
-msgid "All _Headers"
-msgstr "_Vse glave"
-
-#: ../src/main-window.c:660
-#: ../src/message-window.c:331
-msgid "Display all headers"
-msgstr "Pokaže vse glave"
-
-#: ../src/main-window.c:664
-msgid "_Flat index"
-msgstr "_Plosko kazalo"
-
-#: ../src/main-window.c:665
-msgid "No threading at all"
-msgstr "Brez nitenja"
-
-#: ../src/main-window.c:666
-msgid "Si_mple threading"
-msgstr "_Enostavno nitenje"
-
-#: ../src/main-window.c:667
-msgid "Simple threading algorithm"
-msgstr "Enostavni algoritem nitenja"
-
-#: ../src/main-window.c:668
-msgid "_JWZ threading"
-msgstr "_JWZ nitenje"
-
-#: ../src/main-window.c:669
-msgid "Elaborate JWZ threading"
-msgstr "Podrobno nitenje JWZ"
-
-#: ../src/main-window.c:674
-msgid "By _Arrival"
-msgstr "Po _prihodu"
-
-#: ../src/main-window.c:675
-msgid "Arrival order"
-msgstr "Razvrstitev po prihodu"
-
-#: ../src/main-window.c:676
-msgid "By _Sender"
-msgstr "Po _pošiljatelju"
-
-#: ../src/main-window.c:677
-msgid "Sender order"
-msgstr "Razvrstitev po pošiljateljih"
-
-#: ../src/main-window.c:678
-msgid "By S_ubject"
-msgstr "Po _zadevi"
-
-#: ../src/main-window.c:679
-msgid "Subject order"
-msgstr "Razvrstitev po zadevi"
-
-#: ../src/main-window.c:680
-msgid "By Si_ze"
-msgstr "Po _velikosti"
-
-#: ../src/main-window.c:681
-msgid "By message size"
-msgstr "Po velikosti sporočila"
-
-#: ../src/main-window.c:682
-msgid "_Threaded"
-msgstr "_Niten seznam"
-
-#: ../src/main-window.c:683
-msgid "Use message threading"
-msgstr "Uporabi nitenje sporočil"
-
-#: ../src/main-window.c:1032
+#: ../src/main.c:668
+msgid "Show version"
+msgstr "Pokaži različico"
+
+#: ../src/main-window.c:279
 msgid ""
 "Balsa is sending a mail now.\n"
 "Abort sending?"
@@ -5127,36 +5215,74 @@ msgstr ""
 "Balsa sedaj pošilja pošto.\n"
 "Ali naj bo pošiljanje prekinjeno?"
 
-#: ../src/main-window.c:1202
+#: ../src/main-window.c:449
 msgid "Subject or Sender Contains:"
 msgstr "Zadeva ali pošiljatelj vsebuje:"
 
-#: ../src/main-window.c:1203
+#: ../src/main-window.c:450
 msgid "Subject or Recipient Contains:"
 msgstr "Zadeva ali prejemnik vsebuje:"
 
-#: ../src/main-window.c:1204
+#: ../src/main-window.c:451
 msgid "Subject Contains:"
 msgstr "Zadeva vsebuje:"
 
-#: ../src/main-window.c:1205
+#: ../src/main-window.c:452
 msgid "Body Contains:"
 msgstr "Telo vsebuje:"
 
-#: ../src/main-window.c:1206
+#: ../src/main-window.c:453
 msgid "Older than (days):"
 msgstr "Starejše kot (dni):"
 
-#: ../src/main-window.c:1207
+#: ../src/main-window.c:454
 msgid "Old at most (days):"
 msgstr "Staro največ (dni):"
 
-#: ../src/main-window.c:2316
+#: ../src/main-window.c:974
+msgid "translator-credits"
+msgstr ""
+"Matej Urbančič <mateju svn gnome org>\n"
+"Andrej Žnidaršič"
+
+#: ../src/main-window.c:985
+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
+msgid "About Balsa"
+msgstr "O programu"
+
+#: ../src/main-window.c:1012
+#, 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
+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
 #, c-format
-msgid "Opening %s"
-msgstr "Odpiranje %s"
+msgid "Removing duplicates failed: %s"
+msgstr "Odstranjevanje dvojnikov ni uspelo: %s"
+
+#: ../src/main-window.c:1428
+#, c-format
+msgid "Removed %d duplicate"
+msgid_plural "Removed %d duplicates"
+msgstr[0] "Odstranjenih je bilo %d dvojnikov"
+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
+msgid "No duplicates found"
+msgstr "Ni mogoče najti podvojenih sporočil"
 
-#: ../src/main-window.c:2333
+#: ../src/main-window.c:2921
 #, c-format
 msgid ""
 "Unable to Open Mailbox!\n"
@@ -5165,41 +5291,32 @@ msgstr ""
 "Ni mogoče odpreti poštnega predala!\n"
 "%s."
 
-#: ../src/main-window.c:2706
-msgid "translator-credits"
-msgstr ""
-"Matej Urbančič <mateju svn gnome org>\n"
-"Andrej Žnidaršič <andrej znidarsic gmail com>"
-
-#: ../src/main-window.c:2718
-msgid "The Balsa email client is part of the GNOME desktop environment."
-msgstr "Poštni odjemalec Balsa je del namiznega okolja GNOME."
+#: ../src/main-window.c:2956
+#, c-format
+msgid "Opening %s"
+msgstr "Odpiranje %s"
 
-#: ../src/main-window.c:2820
-#: ../src/main-window.c:2838
-msgid "Checking Mail..."
-msgstr "Preverjanje pošte ..."
+#: ../src/main-window.c:3269 ../src/main-window.c:3287
+#, fuzzy
+#| msgid "Checking Mail..."
+msgid "Checking Mail…"
+msgstr "Poteka preverjanje za novo pošto na »%s«"
 
-#: ../src/main-window.c:3041
+#: ../src/main-window.c:3427
 #, c-format
 msgid "IMAP mailbox: %s"
 msgstr "Poštni predal IMAP: %s"
 
-#: ../src/main-window.c:3045
+#: ../src/main-window.c:3431
 #, c-format
 msgid "Local mailbox: %s"
 msgstr "Krajevni poštni predal: %s"
 
-#: ../src/main-window.c:3198
+#: ../src/main-window.c:3599
 msgid "Finished Checking."
 msgstr "Preverjanje je končano."
 
-#: ../src/main-window.c:3263
-#, c-format
-msgid "Sending error: %s"
-msgstr "Napaka pošiljanja: %s"
-
-#: ../src/main-window.c:3328
+#: ../src/main-window.c:3642
 #, c-format
 msgid "You have received %d new message."
 msgid_plural "You have received %d new messages."
@@ -5208,118 +5325,74 @@ 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:3331
+#: ../src/main-window.c:3645
 msgid "You have new mail."
 msgstr "Prispelo je novo sporočilo."
 
-#: ../src/main-window.c:3372
-#, c-format
-msgid "Balsa: you have received %d new message."
-msgid_plural "Balsa: you have received %d new messages."
-msgstr[0] "Balsa: prejeli ste %d novih sporočil."
-msgstr[1] "Balsa: prejeli ste %d novo sporočilo."
-msgstr[2] "Balsa: prejeli ste %d novi sporočili."
-msgstr[3] "Balsa: prejeli ste %d nova sporočila."
-
-#: ../src/main-window.c:3376
-msgid "Balsa: you have new mail."
-msgstr "Balsa: imate novo pošto."
-
-#: ../src/main-window.c:3431
+#: ../src/main-window.c:3713 ../src/main-window.c:3748
 msgid "Balsa: New mail"
 msgstr "Balsa: nova pošta"
 
-#: ../src/main-window.c:3720
-#, c-format
-msgid "The next unread message is in %s"
-msgstr "Naslednje neprebrano sporočilo je v %s"
-
-#: ../src/main-window.c:3727
-#, c-format
-msgid "Do you want to select %s?"
-msgstr "Ali želite izbrati %s?"
-
-#: ../src/main-window.c:4261
+#: ../src/main-window.c:3906
 msgid "Search mailbox"
 msgstr "Išči v poštnem predalu"
 
-#: ../src/main-window.c:4281
+#: ../src/main-window.c:3932
 msgid "_Search for:"
 msgstr "_Poišči:"
 
 #. builds the toggle buttons to specify fields concerned by
 #. * the search.
-#: ../src/main-window.c:4294
+#: ../src/main-window.c:3945
 msgid "In:"
 msgstr "V:"
 
-#: ../src/main-window.c:4305
+#: ../src/main-window.c:3957
 msgid "S_ubject"
 msgstr "Z_adeva"
 
 #. Frame with Apply and Clear buttons
-#: ../src/main-window.c:4310
+#: ../src/main-window.c:3962
 msgid "Show only matching messages"
 msgstr "Pokaži le skladna sporočila"
 
 #. Frame with OK button
-#: ../src/main-window.c:4331
+#: ../src/main-window.c:3983
 msgid "Open next matching message"
 msgstr "Odpri naslednje skladno sporočilo"
 
-#: ../src/main-window.c:4342
+#: ../src/main-window.c:3995
 msgid "_Reverse search"
 msgstr "_Vzvratno iskanje"
 
-#: ../src/main-window.c:4347
+#: ../src/main-window.c:4000
 msgid "_Wrap around"
 msgstr "_Prelomi besedilo"
 
-#: ../src/main-window.c:4522
-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:4537
-#, c-format
-msgid "Removing duplicates failed: %s"
-msgstr "Odstranjevanje dvojnikov ni uspelo: %s"
-
-#: ../src/main-window.c:4543
-#, c-format
-msgid "Removed %d duplicate"
-msgid_plural "Removed %d duplicates"
-msgstr[0] "Odstranjenih je bilo %d dvojnikov"
-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:4548
-msgid "No duplicates found"
-msgstr "Ni mogoče najti podvojenih sporočil"
-
-#: ../src/main-window.c:4777
+#: ../src/main-window.c:4224
 #, c-format
 msgid "Could not open trash: %s"
 msgstr "Ni mogoče odpreti smeti: %s"
 
-#: ../src/main-window.c:4925
-#, c-format
-msgid "Balsa: %s (readonly)"
-msgstr "Balsa: %s (le za branje)"
+#: ../src/main-window.c:4359
+#, fuzzy, c-format
+#| msgid "Balsa: %s (readonly)"
+msgid "Balsa: %s (read-only)"
+msgstr "%s (le za branje)"
 
-#: ../src/main-window.c:4927
+#: ../src/main-window.c:4361
 #, 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:5496
+#: ../src/main-window.c:4861
 #, c-format
 msgid "Shown mailbox: %s "
 msgstr "Pokazan poštni predal: %s"
 
-#: ../src/main-window.c:5501
+#: ../src/main-window.c:4866
 #, c-format
 msgid "with %d message"
 msgid_plural "with %d messages"
@@ -5328,7 +5401,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:5508
+#: ../src/main-window.c:4873
 #, c-format
 msgid ", %d new"
 msgid_plural ", %d new"
@@ -5337,7 +5410,7 @@ msgstr[1] ", %d novo"
 msgstr[2] ", %d novi"
 msgstr[3] ", %d nova,"
 
-#: ../src/main-window.c:5515
+#: ../src/main-window.c:4880
 #, c-format
 msgid ", %d hidden"
 msgid_plural ", %d hidden"
@@ -5346,766 +5419,678 @@ msgstr[1] ", %d skrito"
 msgstr[2] ", %d skriti"
 msgstr[3] ", %d skrita"
 
-#: ../src/main.c:208
-#, c-format
-msgid "Could not write to %s: %s"
-msgstr "Ni mogoče pisati v %s: %s"
-
-#: ../src/main.c:446
-#: ../src/main.c:495
-msgid "Get new mail on startup"
-msgstr "Dobi novo pošto ob zagonu"
-
-#: ../src/main.c:448
-#: ../src/main.c:497
-msgid "Compose a new email to EMAIL@ADDRESS"
-msgstr "Sestavi novo elektronsko pošto za ELEKTRONSKI@NASLOV"
-
-#: ../src/main.c:450
-msgid "Attach file at PATH"
-msgstr "Priloži datoteko na POTI"
-
-#: ../src/main.c:452
-#: ../src/main.c:502
-msgid "Opens MAILBOXNAME"
-msgstr "Odpre ImePoštnegaPredala"
-
-#: ../src/main.c:452
-#: ../src/main.c:502
-msgid "MAILBOXNAME"
-msgstr "ImePoštnegaPredala"
-
-#: ../src/main.c:455
-#: ../src/main.c:505
-msgid "Opens first unread mailbox"
-msgstr "Odpre prvi neprebran poštni predal"
-
-#: ../src/main.c:458
-#: ../src/main.c:508
-msgid "Opens default Inbox on startup"
-msgstr "Ob zagonu odpre privzet dohodni predal"
-
-#: ../src/main.c:461
-#: ../src/main.c:511
-msgid "Prints number unread and unsent messages"
-msgstr "Izpiše število neprebranih in neposlanih sporočil"
-
-#: ../src/main.c:463
-#: ../src/main.c:513
-msgid "Debug POP3 connection"
-msgstr "Razhroščevanje povezave POP3"
-
-#: ../src/main.c:465
-#: ../src/main.c:515
-msgid "Debug IMAP connection"
-msgstr "Razhroščevanje povezave IMAP"
-
-#: ../src/main.c:487
-msgid "The Balsa E-Mail Client"
-msgstr "Balsa odjemalec elektronske pošte"
-
-#: ../src/main.c:499
-msgid "Attach file at URI"
-msgstr "Priloži datoteko na URI"
-
-#: ../src/main.c:540
+#: ../src/main-window.c:4925
 #, c-format
-msgid "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 "The next unread message is in %s"
+msgstr "Naslednje neprebrano sporočilo je v %s"
 
-#: ../src/main.c:587
-#: ../src/main.c:592
-#: ../src/main.c:598
-#: ../src/main.c:604
-#: ../src/main.c:610
+#: ../src/main-window.c:4932
 #, c-format
-msgid "Balsa cannot open your \"%s\" mailbox."
-msgstr "Ni mogoče odpreti poštnega predala \"%s\"."
-
-#: ../src/main.c:587
-msgid "Inbox"
-msgstr "Dohodni predal"
-
-#: ../src/main.c:593
-msgid "Outbox"
-msgstr "Odhodni predal"
-
-#: ../src/main.c:599
-msgid "Sentbox"
-msgstr "Poslana pošta"
-
-#: ../src/main.c:605
-msgid "Draftbox"
-msgstr "Predal osnutkov"
-
-#: ../src/main.c:610
-msgid "Trash"
-msgstr "Smeti"
-
-#: ../src/main.c:832
-msgid "Compressing mail folders..."
-msgstr "Stiskanje poštnih map ..."
+msgid "Do you want to select %s?"
+msgstr "Ali želite izbrati %s?"
 
-#: ../src/message-window.c:242
+#: ../src/message-window.c:303
 msgid "M_ove"
 msgstr "Pr_emakni"
 
-#: ../src/message-window.c:249
-msgid "Close the message window"
-msgstr "Zapei okno sporočila"
-
-#: ../src/message-window.c:255
-msgid "_Find in message"
-msgstr "_Najdi v sporočilu"
-
-#: ../src/message-window.c:309
-msgid "Move the message to Trash mailbox"
-msgstr "Premakne sporočilo v poštni predal smeti"
-
-#: ../src/message-window.c:316
-msgid "Show toolbar"
-msgstr "Pokaži orodno vrstico"
-
-#: ../src/message-window.c:328
-msgid "_Selected Headers"
-msgstr "_Izbrane glave"
-
-#: ../src/message-window.c:1050
+#: ../src/message-window.c:748
 #, c-format
 msgid "Message from %s: %s"
 msgstr "Sporočilo od %s: %s"
 
-#: ../src/pref-manager.c:402
+#: ../src/pref-manager.c:210
 msgid "While retrieving messages"
 msgstr "Med pridobivanjem sporočil"
 
-#: ../src/pref-manager.c:403
+#: ../src/pref-manager.c:211
 msgid "Until closed"
 msgstr "Do zaprtja"
 
-#: ../src/pref-manager.c:409
-msgid "Fast"
-msgstr "Hitro"
-
-#: ../src/pref-manager.c:410
-msgid "Normal"
-msgstr "Običajno"
-
-#: ../src/pref-manager.c:411
-msgid "Bad spellers"
-msgstr "Slabi črkovalniki"
-
-#: ../src/pref-manager.c:417
+#: ../src/pref-manager.c:217
 msgid "Message number"
 msgstr "Številka sporočila"
 
-#: ../src/pref-manager.c:421
+#: ../src/pref-manager.c:221
 msgid "Sender"
 msgstr "Pošiljatelj"
 
-#: ../src/pref-manager.c:425
+#: ../src/pref-manager.c:225
 msgid "Flat"
 msgstr "Plosko"
 
-#: ../src/pref-manager.c:427
+#: ../src/pref-manager.c:227
 msgid "JWZ"
 msgstr "JWZ"
 
-#. must NOT be modal
-#: ../src/pref-manager.c:523
-msgid "Balsa Preferences"
-msgstr "Možnosti programa"
+#: ../src/pref-manager.c:937
+#, c-format
+msgid "%s (default)"
+msgstr "%s (privzeto)"
 
-#: ../src/pref-manager.c:577
-msgid "Mail options"
-msgstr "Možnosti pošte"
+#: ../src/pref-manager.c:1054
+msgid "Default layout"
+msgstr "Privzeta razporeditev"
 
-#: ../src/pref-manager.c:579
-msgid "Display options"
-msgstr "Možnosti prikaza"
+#: ../src/pref-manager.c:1055
+msgid "Wide message layout"
+msgstr "Široka razporeditev sporočila"
 
-#: ../src/pref-manager.c:581
-#: ../src/pref-manager.c:2909
-msgid "Address books"
-msgstr "Imeniki"
+#: ../src/pref-manager.c:1056
+msgid "Wide screen layout"
+msgstr "Å irokozaslonska razporeditev"
 
-#: ../src/pref-manager.c:585
-#: ../src/toolbar-factory.c:157
-msgid "Spelling"
-msgstr "ÄŒrkovanje"
+#: ../src/pref-manager.c:1064
+msgid "Show next unread message"
+msgstr "Pokaži naslednje neprebrano sporočilo"
 
-#: ../src/pref-manager.c:589
-msgid "Startup"
-msgstr "Zagon"
+#: ../src/pref-manager.c:1065
+msgid "Show next message"
+msgstr "Pokaži naslednje sporočilo"
 
-#: ../src/pref-manager.c:591
-#: ../src/pref-manager.c:2697
-msgid "Miscellaneous"
-msgstr "Različno"
+#: ../src/pref-manager.c:1066
+msgid "Close message window"
+msgstr "Zapri okno sporočila"
 
-#: ../src/pref-manager.c:1411
-#, c-format
-msgid "%s (default)"
-msgstr "%s (privzeto)"
+#: ../src/pref-manager.c:1120
+#, 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
+msgid "Show nothing"
+msgstr "Ne pokaži ničesar"
+
+#: ../src/pref-manager.c:1135
+msgid "Show dialog"
+msgstr "Pokaži pogovorno okno"
+
+#: ../src/pref-manager.c:1137
+msgid "Show in list"
+msgstr "Pokaži v seznamu"
 
-#: ../src/pref-manager.c:1671
+#: ../src/pref-manager.c:1139
+msgid "Show in status bar"
+msgstr "Pokaži v vrstici stanja"
+
+#: ../src/pref-manager.c:1141
+msgid "Print to console"
+msgstr "Natisni v konzolo"
+
+#: ../src/pref-manager.c:1153
+msgid "Ask me"
+msgstr "Vprašaj me"
+
+#: ../src/pref-manager.c:1701
+#, fuzzy
+#| msgid "Remote POP3 mailbox..."
+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"
+
+#: ../src/pref-manager.c:1709
+#, fuzzy
+#| msgid "Remote IMAP folder"
+msgid "Remote IMAP folder…"
+msgstr "Oddaljena mapa IMAP"
+
+#: ../src/pref-manager.c:1970
 msgid "Remote mailbox servers"
 msgstr "Oddaljeni strežniki poštnega predala"
 
-#: ../src/pref-manager.c:1692
-#: ../src/pref-manager.c:2930
-#: ../src/sendmsg-window.c:2978
+#: ../src/pref-manager.c:1987 ../src/pref-manager.c:2752
+#: ../src/sendmsg-window.c:2681
 msgid "Type"
 msgstr "Vrsta"
 
-#: ../src/pref-manager.c:1700
+#: ../src/pref-manager.c:1995
 msgid "Mailbox name"
 msgstr "Ime poštnega predala"
 
-#: ../src/pref-manager.c:1714
-#: ../src/pref-manager.c:1787
-#: ../src/pref-manager.c:2965
+#: ../src/pref-manager.c:2017 ../src/pref-manager.c:2100
+#: ../src/pref-manager.c:2795
 msgid "_Modify"
 msgstr "_Spremeni"
 
-#: ../src/pref-manager.c:1728
+#: ../src/pref-manager.c:2039
 msgid "Local mail directory"
 msgstr "Krajevna poštna mapa"
 
-#: ../src/pref-manager.c:1730
+#: ../src/pref-manager.c:2042
 msgid "Select your local mail directory"
 msgstr "Izberite svojo krajevno poštno mapo"
 
-#: ../src/pref-manager.c:1751
+#: ../src/pref-manager.c:2066
 msgid "Outgoing mail servers"
 msgstr "Odhodni poštni strežniki"
 
-#: ../src/pref-manager.c:1773
+#: ../src/pref-manager.c:2084
 msgid "Server name"
 msgstr "Ime strežnika"
 
-#: ../src/pref-manager.c:1813
-msgid "Mail servers"
-msgstr "Poštni strežniki"
-
-#: ../src/pref-manager.c:1815
-msgid "Incoming"
-msgstr "Dohodna"
-
-#: ../src/pref-manager.c:1817
-msgid "Outgoing"
-msgstr "Odhodna"
-
-#: ../src/pref-manager.c:1844
+#: ../src/pref-manager.c:2128
 msgid "Checking"
 msgstr "Preverjanje"
 
-#: ../src/pref-manager.c:1850
+#: ../src/pref-manager.c:2131
 msgid "_Check mail automatically every"
 msgstr "Samodejno _preveri pošto vsakih"
 
-#: ../src/pref-manager.c:1861
-#: ../src/pref-manager.c:2720
-#: ../src/pref-manager.c:2780
+#: ../src/pref-manager.c:2139 ../src/pref-manager.c:2311
+#: ../src/pref-manager.c:2926 ../src/pref-manager.c:2975
 msgid "minutes"
 msgstr "minut"
 
-#: ../src/pref-manager.c:1868
+#: ../src/pref-manager.c:2144
 msgid "Check _IMAP mailboxes"
 msgstr "Preveri poštne predale _IMAP"
 
-#: ../src/pref-manager.c:1874
-msgid "Check INBOX _only"
+#: ../src/pref-manager.c:2148
+#, fuzzy
+#| msgid "Check INBOX _only"
+msgid "Check Inbox _only"
 msgstr "Preveri _le dohoden predal"
 
-#: ../src/pref-manager.c:1881
+#: ../src/pref-manager.c:2153
 msgid "When mail arrives:"
 msgstr "Ko pošta prispe:"
 
-#: ../src/pref-manager.c:1886
+#: ../src/pref-manager.c:2158
 msgid "Display message"
 msgstr "Prikaži sporočilo"
 
-#: ../src/pref-manager.c:1891
+#: ../src/pref-manager.c:2163
 msgid "Play sound"
 msgstr "Predvajaj zvok"
 
-#: ../src/pref-manager.c:1896
+#: ../src/pref-manager.c:2168
 msgid "Show icon"
 msgstr "Pokaži ikono"
 
-#: ../src/pref-manager.c:1905
+#: ../src/pref-manager.c:2175
 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:1910
+#: ../src/pref-manager.c:2178
 msgid "_POP message size limit:"
 msgstr "Omejitev velikosti sporočila _POP:"
 
-#. Quoted text regular expression
-#. and RFC2646-style flowed text
-#: ../src/pref-manager.c:1938
-msgid "Quoted and flowed text"
-msgstr "Navedeno in povezano besedilo"
-
-#: ../src/pref-manager.c:1943
-msgid "Mark quoted text"
-msgstr "Označi navedeno besedilo"
-
-#: ../src/pref-manager.c:1948
-msgid ""
-"Quoted text\n"
-"regular expression:"
-msgstr ""
-"Navedeno besedilo\n"
-"logični izraz:"
-
-#: ../src/pref-manager.c:1957
-msgid "Wrap text at"
-msgstr "Prelomi besedilo na"
-
-#: ../src/pref-manager.c:1968
-#: ../src/pref-manager.c:2135
-msgid "characters"
-msgstr "znakih"
-
-#. handling of multipart/alternative
-#: ../src/pref-manager.c:1983
-msgid "Display of multipart/alternative parts"
-msgstr "Prikaži večdelne/dodatne dele"
-
-#: ../src/pref-manager.c:1986
-msgid "Prefer text/plain over html"
-msgstr "Običajno besedilo naj ima prednost pred html"
-
-#: ../src/pref-manager.c:2002
-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:2009
-msgid "display as \"?\""
-msgstr "prikaži kot \"?\""
-
-#: ../src/pref-manager.c:2018
-msgid "display in codeset"
-msgstr "prikaži v kodnem naboru"
-
-#. How to handle received MDN requests
-#: ../src/pref-manager.c:2048
+#: ../src/pref-manager.c:2207
 msgid "Message disposition notification requests"
 msgstr "Zahteve po obvestilih o prejetju"
 
-#: ../src/pref-manager.c:2050
-msgid "When I receive a message whose sender requested a Message Disposition Notification (MDN), send it if:"
-msgstr "Ob prejemu sporočila, katerega pošiljatelj je zahteval obvestilo o prejemu, bo poslano v primeru, 
da:"
-
-#: ../src/pref-manager.c:2062
+#: ../src/pref-manager.c:2212
 msgid ""
-"The message header looks clean\n"
-"(the notify-to address is the return path,\n"
-"and I am in the \"To:\" or \"Cc:\" list)."
+"When I receive a message whose sender requested a Message Disposition "
+"Notification (MDN), send it if:"
+msgstr ""
+"Ob prejemu sporočila, katerega pošiljatelj je zahteval obvestilo o prejemu, "
+"bo poslano v primeru, da:"
+
+#: ../src/pref-manager.c:2220
+#, fuzzy
+#| msgid ""
+#| "The message header looks clean\n"
+#| "(the notify-to address is the return path,\n"
+#| "and I am in the \"To:\" or \"Cc:\" list)."
+msgid ""
+"The message header looks clean (the notify-to address is the return path, "
+"and I am in the “To:” or “CC:” list)."
 msgstr ""
 "Glava sporočila je videti v redu\n"
 "(naslov za obvestilo je enak kot povratna pot,\n"
 "vaš naslov pa je v vrstici \"Za:\" ali \"Kp:\")."
 
-#: ../src/pref-manager.c:2079
+#: ../src/pref-manager.c:2234
 msgid "The message header looks suspicious."
 msgstr "Glava sporočila je videti sumljiva."
 
-#: ../src/pref-manager.c:2116
+#: ../src/pref-manager.c:2258
 msgid "Word wrap"
 msgstr "Prelom besed"
 
-#: ../src/pref-manager.c:2121
+#: ../src/pref-manager.c:2261
 msgid "Wrap outgoing text at"
 msgstr "Prelomi izhodno besedilo na"
 
-#: ../src/pref-manager.c:2149
+#: ../src/pref-manager.c:2270 ../src/pref-manager.c:2525
+msgid "characters"
+msgstr "znakih"
+
+#: ../src/pref-manager.c:2289
 msgid "Other options"
 msgstr "Druge možnosti"
 
-#: ../src/pref-manager.c:2154
+#: ../src/pref-manager.c:2291
 msgid "Reply prefix:"
 msgstr "Predpona odgovora:"
 
-#: ../src/pref-manager.c:2157
+#: ../src/pref-manager.c:2294
 msgid "Automatically quote original when replying"
 msgstr "Ob odgovarjanju samodejno navedi izvirnik"
 
-#: ../src/pref-manager.c:2160
+#: ../src/pref-manager.c:2297
 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:2163
+#: ../src/pref-manager.c:2300
 msgid "Copy outgoing messages to sentbox"
 msgstr "Kopiraj odhodna sporočila v predal poslane pošte"
 
-#: ../src/pref-manager.c:2165
+#: ../src/pref-manager.c:2302
 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:2168
+#: ../src/pref-manager.c:2306
+#, fuzzy
+#| msgid "_Check mail automatically every"
+msgid "_Send queued mail automatically every"
+msgstr "Samodejno _preveri pošto vsakih"
+
+#: ../src/pref-manager.c:2316
 msgid "Edit headers in external editor"
 msgstr "Uredi glave v zunanjem urejevalniku"
 
-#: ../src/pref-manager.c:2170
+#: ../src/pref-manager.c:2318
 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:2187
-msgid "Layout"
-msgstr "Razporeditev"
-
-#: ../src/pref-manager.c:2189
-msgid "Sort and thread"
-msgstr "Razvrsti in ustvari niten seznam"
-
-#: ../src/pref-manager.c:2191
-#: ../src/print-gtk.c:489
-msgid "Message"
-msgstr "Sporočilo"
-
-#: ../src/pref-manager.c:2193
-msgid "Colors"
-msgstr "Barve"
-
-#: ../src/pref-manager.c:2195
-#: ../src/pref-manager.c:2286
-msgid "Format"
-msgstr "Oblika"
-
-#: ../src/pref-manager.c:2197
-msgid "Status messages"
-msgstr "Sporočila stanja"
+msgstr ""
+"Ob odgovarjanju ali posredovanju vključi dele HTML kot običajno besedilo"
 
-#: ../src/pref-manager.c:2222
-#: ../src/toolbar-prefs.c:168
+#: ../src/pref-manager.c:2336 ../src/toolbar-prefs.c:170
 msgid "Main window"
 msgstr "Glavno okno"
 
-#: ../src/pref-manager.c:2225
+#: ../src/pref-manager.c:2339
 msgid "Use preview pane"
 msgstr "Uporabi pladenj predogleda"
 
-#: ../src/pref-manager.c:2227
-msgid "Show mailbox statistics in left pane"
-msgstr "Pokaži statistiko poštnega predala v levem pladnju"
+#: ../src/pref-manager.c:2343
+#, 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:2231
+#: ../src/pref-manager.c:2349
 msgid "Automatically view message when mailbox opened"
 msgstr "Samodejno poglej sporočilo ob odprtju poštnega predala"
 
-#: ../src/pref-manager.c:2234
+#: ../src/pref-manager.c:2352
 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"
+msgstr ""
+"Vprašaj me pred izbiro drugega poštnega predala za prikaz neprebranega "
+"sporočila"
 
-#: ../src/pref-manager.c:2240
-msgid "PageUp/PageDown keys scroll text by"
+#: ../src/pref-manager.c:2356
+#, 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:2251
+#: ../src/pref-manager.c:2364
 msgid "percent"
 msgstr "odstotkov"
 
-#: ../src/pref-manager.c:2266
-msgid "Display progress dialog"
-msgstr "Pokaži pogovorno okno napredovanja"
+#: ../src/pref-manager.c:2381 ../src/toolbar-prefs.c:192
+msgid "Message window"
+msgstr "Okno sporočila"
 
-#: ../src/pref-manager.c:2291
-msgid "Date encoding (for strftime):"
-msgstr "Kodiranje datuma (za strftime):"
+#: ../src/pref-manager.c:2383
+msgid "After moving a message:"
+msgstr "Po premikanju sporočila:"
 
-#: ../src/pref-manager.c:2293
-msgid "Selected headers:"
-msgstr "Izbrane glave:"
+#: ../src/pref-manager.c:2404
+msgid "Sorting and threading"
+msgstr "Razvrščanje in nitenje"
 
-#: ../src/pref-manager.c:2315
-msgid "Information messages"
-msgstr "Sporočila podrobnosti"
+#: ../src/pref-manager.c:2406
+msgid "Default sort column:"
+msgstr "Privzet stolpec razvrščanja:"
 
-#: ../src/pref-manager.c:2320
-msgid "Information messages:"
-msgstr "Sporočila podrobnosti:"
+#: ../src/pref-manager.c:2413
+msgid "Default threading style:"
+msgstr "Privzet slog nitenja:"
 
-#: ../src/pref-manager.c:2324
-msgid "Warning messages:"
-msgstr "Sporočila opozoril:"
+#: ../src/pref-manager.c:2421
+msgid "Expand threads on open"
+msgstr "Ob odprtju razširi niti"
 
-#: ../src/pref-manager.c:2328
-msgid "Error messages:"
-msgstr "Sporočila napak:"
+#: ../src/pref-manager.c:2446 ../src/print-gtk.c:506
+msgid "Fonts"
+msgstr "Pisave"
 
-#: ../src/pref-manager.c:2332
-msgid "Fatal error messages:"
-msgstr "Sporočila usodnih napak:"
+#: ../src/pref-manager.c:2449
+msgid "Use system fonts"
+msgstr "Uporabi sistemske pisave"
 
-#: ../src/pref-manager.c:2336
-msgid "Debug messages:"
-msgstr "Sporočila razhroščevanja:"
+#: ../src/pref-manager.c:2457
+msgid "Use default font size"
+msgstr "Uporabi privzeto velikost pisave"
+
+#: ../src/pref-manager.c:2463
+msgid "Message font:"
+msgstr "Pisava sporočila:"
+
+#: ../src/pref-manager.c:2470
+msgid "Subject font:"
+msgstr "Pisava zadeve:"
 
-#: ../src/pref-manager.c:2362
+#. Quoted text regular expression
+#. and RFC2646-style flowed text
+#: ../src/pref-manager.c:2510
+msgid "Quoted and flowed text"
+msgstr "Navedeno in povezano besedilo"
+
+#: ../src/pref-manager.c:2513
+msgid "Mark quoted text"
+msgstr "Označi navedeno besedilo"
+
+#: ../src/pref-manager.c:2516
+#, fuzzy
+#| msgid ""
+#| "Quoted text\n"
+#| "regular expression:"
+msgid "Quoted text regular expression:"
+msgstr "Ali je iskalni niz zapisan kot logični izraz."
+
+#: ../src/pref-manager.c:2519
+msgid "Wrap text at"
+msgstr "Prelomi besedilo na"
+
+#. handling of multipart/alternative
+#: ../src/pref-manager.c:2542
+msgid "Display of multipart/alternative parts"
+msgstr "Prikaži večdelne/dodatne dele"
+
+#: ../src/pref-manager.c:2546
+#, 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
 msgid "Message colors"
 msgstr "Barve sporočila"
 
-#: ../src/pref-manager.c:2367
+#: ../src/pref-manager.c:2567
 #, c-format
 msgid "Quote level %d color"
 msgstr "%d barva ravni navedbe"
 
-#: ../src/pref-manager.c:2380
+#: ../src/pref-manager.c:2585
 msgid "Link color"
 msgstr "Barva povezave"
 
-#: ../src/pref-manager.c:2382
+#: ../src/pref-manager.c:2587
 msgid "Hyperlink color"
 msgstr "Barva hiperpovezave"
 
-#: ../src/pref-manager.c:2393
-msgid "Composition window"
-msgstr "Sestavljalno okno"
+#: ../src/pref-manager.c:2602 ../src/pref-manager.c:3217
+msgid "Format"
+msgstr "Oblika"
 
-#: ../src/pref-manager.c:2397
-msgid "Invalid or incomplete address label color"
-msgstr "Neveljavna ali nepopolna barva oznake naslova"
+#: ../src/pref-manager.c:2605
+msgid "Date encoding (for strftime):"
+msgstr "Kodiranje datuma (za strftime):"
 
-#: ../src/pref-manager.c:2483
-#: ../src/print-gtk.c:498
-msgid "Fonts"
-msgstr "Pisave"
+#: ../src/pref-manager.c:2607
+msgid "Selected headers:"
+msgstr "Izbrane glave:"
 
-#: ../src/pref-manager.c:2487
-msgid "Message font:"
-msgstr "Pisava sporočila:"
+#. treatment of messages with 8-bit chars, but without proper MIME encoding
+#: ../src/pref-manager.c:2625
+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:2492
-msgid "Subject font:"
-msgstr "Pisava zadeve:"
+#: ../src/pref-manager.c:2630
+#, fuzzy
+#| msgid "display as \"?\""
+msgid "display as “?”"
+msgstr "[Prikaz]"
 
-#: ../src/pref-manager.c:2498
-msgid "Use default font size"
-msgstr "Uporabi privzeto velikost pisave"
+#: ../src/pref-manager.c:2638
+msgid "display in codeset"
+msgstr "prikaži v kodnem naboru"
 
-#: ../src/pref-manager.c:2546
-msgid "Sorting and threading"
-msgstr "Razvrščanje in nitenje"
+#: ../src/pref-manager.c:2663
+msgid "Information messages"
+msgstr "Sporočila podrobnosti"
 
-#: ../src/pref-manager.c:2550
-msgid "Default sort column:"
-msgstr "Privzet stolpec razvrščanja:"
+#: ../src/pref-manager.c:2667
+msgid "Information messages:"
+msgstr "Sporočila podrobnosti:"
 
-#: ../src/pref-manager.c:2554
-msgid "Default threading style:"
-msgstr "Privzet slog nitenja:"
+#: ../src/pref-manager.c:2671
+msgid "Warning messages:"
+msgstr "Sporočila opozoril:"
 
-#: ../src/pref-manager.c:2559
-msgid "Expand threads on open"
-msgstr "Ob odprtju razširi niti"
+#: ../src/pref-manager.c:2675
+msgid "Error messages:"
+msgstr "Sporočila napak:"
+
+#: ../src/pref-manager.c:2679
+msgid "Fatal error messages:"
+msgstr "Sporočila usodnih napak:"
 
-#: ../src/pref-manager.c:2634
-msgid "Pspell settings"
-msgstr "Nastavitve pspell"
+#: ../src/pref-manager.c:2683
+msgid "Debug messages:"
+msgstr "Sporočila razhroščevanja:"
+
+#: ../src/pref-manager.c:2701
+msgid "Display progress dialog"
+msgstr "Pokaži pogovorno okno napredovanja"
 
-#: ../src/pref-manager.c:2640
-msgid "Spell check module"
-msgstr "Modul preverjanja črkovanja"
+#: ../src/pref-manager.c:2732 ../src/pref-manager.c:3350
+msgid "Address books"
+msgstr "Imeniki"
 
-#: ../src/pref-manager.c:2646
-msgid "Suggestion level"
-msgstr "Raven predlogov"
+#: ../src/pref-manager.c:2760
+msgid "Address book name"
+msgstr "Ime imenika"
 
-#. do the ignore length
-#: ../src/pref-manager.c:2651
-msgid "Ignore words shorter than"
-msgstr "Prezri besede krajše od"
+#: ../src/pref-manager.c:2768
+msgid "Auto-complete"
+msgstr "Samodejno zaključevanje"
 
-#: ../src/pref-manager.c:2669
+#: ../src/pref-manager.c:2801
+msgid "_Set as default"
+msgstr "_Nastavi kot privzeto"
+
+#: ../src/pref-manager.c:2818
 msgid "Miscellaneous spelling settings"
 msgstr "Različne nastavitve črkovanja"
 
-#: ../src/pref-manager.c:2671
+#: ../src/pref-manager.c:2822
 msgid "Check signature"
 msgstr "Preveri podpis"
 
-#: ../src/pref-manager.c:2672
+#: ../src/pref-manager.c:2824
 msgid "Check quoted"
 msgstr "Preveri navedeno"
 
-#: ../src/pref-manager.c:2699
+#: ../src/pref-manager.c:2840
+#, fuzzy
+#| msgid "Startup options"
+msgid "Start-up options"
+msgstr "Začetni profil:"
+
+#: ../src/pref-manager.c:2843
+#, fuzzy
+#| msgid "Open Inbox upon startup"
+msgid "Open Inbox upon start-up"
+msgstr "Ob zagonu odpri dohodno pošto"
+
+#: ../src/pref-manager.c:2845
+#, fuzzy
+#| msgid "Check mail upon startup"
+msgid "Check mail upon start-up"
+msgstr "Ob zagonu preveri pošto"
+
+#: ../src/pref-manager.c:2847
+msgid "Remember open mailboxes between sessions"
+msgstr "Zapomni si odprte poštne predale med sejami"
+
+#: ../src/pref-manager.c:2865
+msgid "Folder scanning"
+msgstr "Preiskovanje map"
+
+#: ../src/pref-manager.c:2868
+#, fuzzy
+#| msgid ""
+#| "Choose depth 1 for fast startup; this defers scanning some folders.  To "
+#| "see more of the tree at startup, choose a greater depth."
+msgid ""
+"Choose depth 1 for fast start-up; this defers scanning some folders. To see "
+"more of the tree at start-up, choose a greater depth."
+msgstr ""
+"Izberite globino 1 za hiter zagon; to onemogoči preiskovanje nekaterih map. "
+"V primeru, da želite ob zagonu videti večji del drevesa, izberite večjo "
+"globino."
+
+#: ../src/pref-manager.c:2875
+msgid "Scan local folders to depth"
+msgstr "Preiskovanje krajevnih map do globine"
+
+#: ../src/pref-manager.c:2884
+msgid "Scan IMAP folders to depth"
+msgstr "Preiskovanje map IMAP do globine"
+
+#: ../src/pref-manager.c:2906 ../src/pref-manager.c:3364
+msgid "Miscellaneous"
+msgstr "Različno"
+
+#: ../src/pref-manager.c:2909
 msgid "Debug"
 msgstr "Razhroščevanje"
 
-#: ../src/pref-manager.c:2700
+#: ../src/pref-manager.c:2911
 msgid "Empty trash on exit"
 msgstr "Ob izhodu izprazni smeti"
 
-#: ../src/pref-manager.c:2707
+#: ../src/pref-manager.c:2915
 msgid "Close mailbox if unused more than"
 msgstr "Zapri poštni predal, če ni uporabljen več kot"
 
-#: ../src/pref-manager.c:2735
+#: ../src/pref-manager.c:2943
 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:2740
+#: ../src/pref-manager.c:2948
 #, c-format
-msgid "The following setting is global, but may be overridden for the selected mailbox using Mailbox %s Hide 
messages:"
-msgstr "Nastavitev je splošna, vendar jo je mogoče za izbrane poštne predale prepisati s skritimi %s 
sporočili poštnega predala:"
+msgid ""
+"The following setting is global, but may be overridden for the selected "
+"mailbox using Mailbox %s Hide messages:"
+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:2752
+#: ../src/pref-manager.c:2956
 msgid "Hide messages marked as deleted"
 msgstr "Skrij sporočila označena kot izbrisana"
 
-#: ../src/pref-manager.c:2754
+#: ../src/pref-manager.c:2958
 msgid "The following settings are global:"
 msgstr "Naslednje nastavitve so splošne:"
 
-#: ../src/pref-manager.c:2760
+#: ../src/pref-manager.c:2961
 msgid "Expunge deleted messages when mailbox is closed"
 msgstr "Samodejno uniči izbrisana sporočila ob zaprtju poštnega predala"
 
-#: ../src/pref-manager.c:2767
-msgid "...and if unused more than"
-msgstr "... in če je neuporabljenega več kot"
-
-#: ../src/pref-manager.c:2792
-#: ../src/toolbar-prefs.c:182
-msgid "Message window"
-msgstr "Okno sporočila"
-
-#: ../src/pref-manager.c:2797
-msgid "After moving a message:"
-msgstr "Po premikanju sporočila:"
-
-#: ../src/pref-manager.c:2826
-msgid "Startup options"
-msgstr "Možnosti zagona"
-
-#: ../src/pref-manager.c:2829
-msgid "Open Inbox upon startup"
-msgstr "Ob zagonu odpri dohodno pošto"
-
-#: ../src/pref-manager.c:2831
-msgid "Check mail upon startup"
-msgstr "Ob zagonu preveri pošto"
-
-#: ../src/pref-manager.c:2833
-msgid "Remember open mailboxes between sessions"
-msgstr "Zapomni si odprte poštne predale med sejami"
-
-#: ../src/pref-manager.c:2847
-msgid "Folder scanning"
-msgstr "Preiskovanje map"
-
-#: ../src/pref-manager.c:2849
-msgid "Choose depth 1 for fast startup; this defers scanning some folders.  To see more of the tree at 
startup, choose a greater depth."
-msgstr "Izberite globino 1 za hiter zagon; to onemogoči preiskovanje nekaterih map. V primeru, da želite ob 
zagonu videti večji del drevesa, izberite večjo globino."
-
-#: ../src/pref-manager.c:2860
-msgid "Scan local folders to depth"
-msgstr "Preiskovanje krajevnih map do globine"
-
-#: ../src/pref-manager.c:2873
-msgid "Scan IMAP folders to depth"
-msgstr "Preiskovanje map IMAP do globine"
-
-#: ../src/pref-manager.c:2938
-msgid "Address book name"
-msgstr "Ime imenika"
-
-#: ../src/pref-manager.c:2946
-msgid "Auto-complete"
-msgstr "Samodejno zaključevanje"
-
-#: ../src/pref-manager.c:2971
-msgid "_Set as default"
-msgstr "_Nastavi kot privzeto"
-
-#: ../src/pref-manager.c:3276
-msgid "Remote POP3 mailbox..."
-msgstr "Oddaljen poštni predal POP3 ..."
-
-#: ../src/pref-manager.c:3408
-msgid "Show nothing"
-msgstr "Ne pokaži ničesar"
-
-#: ../src/pref-manager.c:3410
-msgid "Show dialog"
-msgstr "Pokaži pogovorno okno"
+#: ../src/pref-manager.c:2965
+#, 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:3412
-msgid "Show in list"
-msgstr "Pokaži v seznamu"
+#: ../src/pref-manager.c:3182
+msgid "Mail options"
+msgstr "Možnosti pošte"
 
-#: ../src/pref-manager.c:3414
-msgid "Show in status bar"
-msgstr "Pokaži v vrstici stanja"
+#: ../src/pref-manager.c:3186
+msgid "Incoming"
+msgstr "Dohodna"
 
-#: ../src/pref-manager.c:3416
-msgid "Print to console"
-msgstr "Natisni v konzolo"
+#: ../src/pref-manager.c:3190
+msgid "Outgoing"
+msgstr "Odhodna"
 
-#: ../src/pref-manager.c:3427
-msgid "Ask me"
-msgstr "Vprašaj me"
+#: ../src/pref-manager.c:3201
+msgid "Display options"
+msgstr "Možnosti prikaza"
 
-#: ../src/pref-manager.c:3543
-msgid "Default layout"
-msgstr "Privzeta razporeditev"
+#: ../src/pref-manager.c:3205
+msgid "Sort and thread"
+msgstr "Razvrsti in ustvari niten seznam"
 
-#: ../src/pref-manager.c:3544
-msgid "Wide message layout"
-msgstr "Široka razporeditev sporočila"
+#: ../src/pref-manager.c:3209 ../src/print-gtk.c:497
+msgid "Message"
+msgstr "Sporočilo"
 
-#: ../src/pref-manager.c:3545
-msgid "Wide screen layout"
-msgstr "Å irokozaslonska razporeditev"
+#: ../src/pref-manager.c:3213
+msgid "Colors"
+msgstr "Barve"
 
-#: ../src/pref-manager.c:3553
-msgid "Show next unread message"
-msgstr "Pokaži naslednje neprebrano sporočilo"
+#: ../src/pref-manager.c:3221
+msgid "Status messages"
+msgstr "Sporočila stanja"
 
-#: ../src/pref-manager.c:3554
-msgid "Show next message"
-msgstr "Pokaži naslednje sporočilo"
+#. must NOT be modal
+#: ../src/pref-manager.c:3292
+msgid "Balsa Preferences"
+msgstr "Možnosti programa"
 
-#: ../src/pref-manager.c:3555
-msgid "Close message window"
-msgstr "Zapri okno sporočila"
+#: ../src/pref-manager.c:3355 ../src/toolbar-factory.c:166
+msgid "Spelling"
+msgstr "ÄŒrkovanje"
 
-#: ../src/pref-manager.c:3596
-#, c-format
-msgid "Error displaying link_id %s: %s\n"
-msgstr "Napaka med prikazom link_id %s: %s\n"
+#: ../src/pref-manager.c:3360
+#, fuzzy
+#| msgid "Startup"
+msgid "Start-up"
+msgstr "Zagon"
 
-#: ../src/print-gtk.c:91
-#: ../src/print-gtk.c:242
+#: ../src/print-gtk.c:89 ../src/print-gtk.c:248
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stran %d od %d"
 
-#: ../src/print-gtk.c:145
-#: ../src/print-gtk.c:164
+#: ../src/print-gtk.c:143 ../src/print-gtk.c:169
 msgid "Signed and encrypted matter"
 msgstr "Å ifrirana in podpisana zadeva"
 
-#: ../src/print-gtk.c:149
-#: ../src/print-gtk.c:168
+#: ../src/print-gtk.c:147 ../src/print-gtk.c:173
 msgid "Signed matter"
 msgstr "Podpisana zadeva"
 
-#: ../src/print-gtk.c:192
+#: ../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:346
+#: ../src/print-gtk.c:199
+msgid "OpenPGP"
+msgstr "OpenPGP"
+
+#: ../src/print-gtk.c:352
 #, c-format
-msgid "Cannot print page %d because the document has only %d pages."
-msgstr "Strani %d ni mogoče natisniti, ker ima dokument samo %d strani."
+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."
+msgstr[0] "Strani %d ni mogoče natisniti, ker ima dokument samo %d strani."
+msgstr[1] "Strani %d ni mogoče natisniti, ker ima dokument samo %d stran."
+msgstr[2] "Strani %d ni mogoče natisniti, ker ima dokument samo %d strani."
+msgstr[3] "Strani %d ni mogoče natisniti, ker ima dokument samo %d strani."
 
 #. Translate to the default units to use for presenting
 #. * lengths to the user. Translate to default:inch if you
@@ -6113,72 +6098,72 @@ msgstr "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:380
+#: ../src/print-gtk.c:390
 msgid "default:mm"
-msgstr "default:mm"
+msgstr "privzeto:mm"
 
-#: ../src/print-gtk.c:437
+#: ../src/print-gtk.c:446
 msgid "inch"
 msgstr "palec"
 
-#: ../src/print-gtk.c:444
+#: ../src/print-gtk.c:453
 msgid "mm"
 msgstr "mm"
 
-#: ../src/print-gtk.c:519
+#: ../src/print-gtk.c:527
 msgid "_Header Font:"
 msgstr "Pisava _glave:"
 
-#: ../src/print-gtk.c:522
+#: ../src/print-gtk.c:530
 msgid "B_ody Font:"
 msgstr "Pisava _telesa:"
 
-#: ../src/print-gtk.c:525
+#: ../src/print-gtk.c:533
 msgid "_Footer Font:"
 msgstr "Pisava _noge:"
 
-#: ../src/print-gtk.c:532
+#: ../src/print-gtk.c:540
 msgid "Highlighting"
 msgstr "Poudarjanje"
 
-#: ../src/print-gtk.c:547
+#: ../src/print-gtk.c:555
 msgid "Highlight _cited text"
 msgstr "Poudari _navedeno besedilo"
 
-#: ../src/print-gtk.c:556
+#: ../src/print-gtk.c:564
 msgid "Highlight _structured phrases"
 msgstr "Poudari _oblikovana rekla"
 
-#: ../src/print-gtk.c:567
+#: ../src/print-gtk.c:575
 msgid "Margins"
 msgstr "Robovi"
 
-#: ../src/print-gtk.c:589
+#: ../src/print-gtk.c:597
 msgid "_Top"
 msgstr "_Zgoraj"
 
-#: ../src/print-gtk.c:595
+#: ../src/print-gtk.c:603
 msgid "_Bottom"
 msgstr "_Spodaj"
 
-#: ../src/print-gtk.c:607
+#: ../src/print-gtk.c:615
 msgid "_Left"
 msgstr "_Levo"
 
-#: ../src/print-gtk.c:613
+#: ../src/print-gtk.c:621
 msgid "_Right"
 msgstr "_Desno"
 
-#: ../src/print-gtk.c:739
+#: ../src/print-gtk.c:747
 #, c-format
 msgid "Error printing message: %s"
 msgstr "Napaka med tiskanjem sporočila: %s"
 
-#: ../src/save-restore.c:601
+#: ../src/save-restore.c:588
 msgid "Error during filters loading: "
 msgstr "Napaka med nalaganjem filtrov: "
 
-#: ../src/save-restore.c:603
+#: ../src/save-restore.c:590
 #, c-format
 msgid ""
 "Error during filters loading: %s\n"
@@ -6187,556 +6172,344 @@ msgstr ""
 "Napaka med nalaganjem filtrov: %s\n"
 "Filtri so lahko nepravilni."
 
-#: ../src/save-restore.c:727
-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:1008
-msgid "The option not to send \"format=flowed\" text is now on the Options menu of the compose window."
-msgstr "Možnost za ne-pošiljanje besedila \"format=povezano\" je sedaj zapisana v meniju možnosti 
sestavljalnega okna."
-
-#: ../src/save-restore.c:1040
-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:1122
-msgid "This version of Balsa uses a new user interface; if you have changed Balsa's keyboard accelerators, 
you will need to set them again."
-msgstr "Ta različica programa uporablja nov uporabniški vmesnik; v primeru da ste spremenili tipkovne 
bližnjice programa, jih boste morali ponovno nastaviti."
+#: ../src/save-restore.c:712
+#, 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:2154
-msgid "Error opening GConf database\n"
-msgstr "Napaka med odpiranjem podatkovne zbirke GConf\n"
+#: ../src/save-restore.c:989
+#, fuzzy
+#| msgid ""
+#| "The option not to send \"format=flowed\" text is now on the Options menu "
+#| "of the compose window."
+msgid ""
+"The option not to send “format=flowed” text is now on the Options menu of "
+"the compose window."
+msgstr ""
+"Možnost za ne-pošiljanje besedila \"format=povezano\" je sedaj zapisana v "
+"meniju možnosti sestavljalnega okna."
 
-#: ../src/save-restore.c:2162
-#: ../src/save-restore.c:2173
-#, c-format
-msgid "Error setting GConf field: %s\n"
-msgstr "Napaka med nastavljanjem polja GConf: %s\n"
+#: ../src/save-restore.c:1028
+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
+#, fuzzy
+#| msgid ""
+#| "This version of Balsa uses a new user interface; if you have changed "
+#| "Balsa's keyboard accelerators, you will need to set them again."
+msgid ""
+"This version of Balsa uses a new user interface; if you have changed Balsa’s "
+"keyboard accelerators, you will need to set them again."
+msgstr ""
+"Ta različica programa uporablja nov uporabniški vmesnik; v primeru da ste "
+"spremenili tipkovne bližnjice programa, jih boste morali ponovno nastaviti."
 
 #. Translators: please use the initial letter of each language as
 #. * its accelerator; this is a long list, and unique accelerators
 #. * cannot be found.
-#: ../src/sendmsg-window.c:257
+#: ../src/sendmsg-window.c:183
 msgid "_Brazilian Portuguese"
 msgstr "_Portugalščina"
 
-#: ../src/sendmsg-window.c:258
+#: ../src/sendmsg-window.c:184
 msgid "_Catalan"
 msgstr "_Katalonščina"
 
-#: ../src/sendmsg-window.c:259
+#: ../src/sendmsg-window.c:185
 msgid "_Chinese Simplified"
 msgstr "_Poenostavljena kitajščina"
 
-#: ../src/sendmsg-window.c:260
+#: ../src/sendmsg-window.c:186
 msgid "_Chinese Traditional"
 msgstr "_Tradicionalna kitajščina"
 
-#: ../src/sendmsg-window.c:261
+#: ../src/sendmsg-window.c:187
 msgid "_Czech"
 msgstr "_Češčina"
 
-#: ../src/sendmsg-window.c:262
+#: ../src/sendmsg-window.c:188
 msgid "_Danish"
 msgstr "_Danščina"
 
-#: ../src/sendmsg-window.c:263
+#: ../src/sendmsg-window.c:189
 msgid "_Dutch"
 msgstr "_Nizozemščina"
 
-#: ../src/sendmsg-window.c:264
+#: ../src/sendmsg-window.c:190
 msgid "_English (American)"
 msgstr "_Angleščina (ameriška)"
 
-#: ../src/sendmsg-window.c:265
+#: ../src/sendmsg-window.c:191
 msgid "_English (British)"
 msgstr "_Angleščina (britanska)"
 
-#: ../src/sendmsg-window.c:266
+#: ../src/sendmsg-window.c:192
 msgid "_Esperanto"
 msgstr "_Esperanto"
 
-#: ../src/sendmsg-window.c:267
+#: ../src/sendmsg-window.c:193
 msgid "_Estonian"
 msgstr "_Estonščina"
 
-#: ../src/sendmsg-window.c:268
+#: ../src/sendmsg-window.c:194
 msgid "_Finnish"
 msgstr "_Finščina"
 
-#: ../src/sendmsg-window.c:269
+#: ../src/sendmsg-window.c:195
 msgid "_French"
 msgstr "_Francoščina"
 
-#: ../src/sendmsg-window.c:270
+#: ../src/sendmsg-window.c:196
 msgid "_German"
 msgstr "_Nemščina"
 
-#: ../src/sendmsg-window.c:271
+#: ../src/sendmsg-window.c:197
 msgid "_German (Austrian)"
 msgstr "_Nemščina (avstrijska)"
 
-#: ../src/sendmsg-window.c:272
+#: ../src/sendmsg-window.c:198
 msgid "_German (Swiss)"
 msgstr "_Nemščina (švicarska)"
 
-#: ../src/sendmsg-window.c:273
+#: ../src/sendmsg-window.c:199
 msgid "_Greek"
 msgstr "_Grščina"
 
-#: ../src/sendmsg-window.c:274
+#: ../src/sendmsg-window.c:200
 msgid "_Hebrew"
 msgstr "_Hebrejščina"
 
-#: ../src/sendmsg-window.c:275
+#: ../src/sendmsg-window.c:201
 msgid "_Hungarian"
 msgstr "_Madžarščina"
 
-#: ../src/sendmsg-window.c:276
+#: ../src/sendmsg-window.c:202
 msgid "_Italian"
 msgstr "_Italjanščina"
 
-#: ../src/sendmsg-window.c:277
+#: ../src/sendmsg-window.c:203
 msgid "_Japanese (JIS)"
 msgstr "_Japonščina"
 
-#: ../src/sendmsg-window.c:278
+#: ../src/sendmsg-window.c:204
 msgid "_Kazakh"
 msgstr "_Kazahstanščina"
 
-#: ../src/sendmsg-window.c:279
+#: ../src/sendmsg-window.c:205
 msgid "_Korean"
 msgstr "_Korejščina"
 
-#: ../src/sendmsg-window.c:280
+#: ../src/sendmsg-window.c:206
 msgid "_Latvian"
 msgstr "_Latvijščina"
 
-#: ../src/sendmsg-window.c:281
+#: ../src/sendmsg-window.c:207
 msgid "_Lithuanian"
 msgstr "_Litvanščina"
 
-#: ../src/sendmsg-window.c:282
+#: ../src/sendmsg-window.c:208
 msgid "_Norwegian"
 msgstr "_Norveščina"
 
-#: ../src/sendmsg-window.c:283
+#: ../src/sendmsg-window.c:209
 msgid "_Polish"
 msgstr "_Poljščina"
 
-#: ../src/sendmsg-window.c:284
-msgid "_Portugese"
-msgstr "_Portugalščina"
+#: ../src/sendmsg-window.c:210
+#, fuzzy
+#| msgid "_Portugese"
+msgid "_Portuguese"
+msgstr "portugalska"
 
-#: ../src/sendmsg-window.c:285
+#: ../src/sendmsg-window.c:211
 msgid "_Romanian"
 msgstr "_Romunščina"
 
-#: ../src/sendmsg-window.c:286
+#: ../src/sendmsg-window.c:212
 msgid "_Russian"
 msgstr "_Ruščina"
 
-#: ../src/sendmsg-window.c:287
+#: ../src/sendmsg-window.c:213
 msgid "_Serbian"
 msgstr "_Srbščina"
 
-#: ../src/sendmsg-window.c:288
+#: ../src/sendmsg-window.c:214
 msgid "_Serbian (Latin)"
 msgstr "_Srbščina (v latinici)"
 
-#: ../src/sendmsg-window.c:289
+#: ../src/sendmsg-window.c:215
 msgid "_Slovak"
 msgstr "_Slovaščina"
 
-#: ../src/sendmsg-window.c:290
+#: ../src/sendmsg-window.c:216
 msgid "_Spanish"
 msgstr "_Španščina"
 
-#: ../src/sendmsg-window.c:291
+#: ../src/sendmsg-window.c:217
 msgid "_Swedish"
 msgstr "_Švedščina"
 
-#: ../src/sendmsg-window.c:292
+#: ../src/sendmsg-window.c:218
 msgid "_Tatar"
 msgstr "_Tatarščina"
 
-#: ../src/sendmsg-window.c:293
+#: ../src/sendmsg-window.c:219
 msgid "_Turkish"
 msgstr "_Turščina"
 
-#: ../src/sendmsg-window.c:294
+#: ../src/sendmsg-window.c:220
 msgid "_Ukrainian"
 msgstr "_Ukrajinščina"
 
-#: ../src/sendmsg-window.c:295
+#: ../src/sendmsg-window.c:221
 msgid "_Generic UTF-8"
 msgstr "_Splošni UTF-8"
 
-#: ../src/sendmsg-window.c:321
-msgid "_Show"
-msgstr "_Pokaži"
-
-#: ../src/sendmsg-window.c:322
-msgid "_Language"
-msgstr "_Jezik"
-
-#: ../src/sendmsg-window.c:323
-msgid "_Options"
-msgstr "_Možnosti"
-
-#: ../src/sendmsg-window.c:333
-msgid "_Include File..."
-msgstr "_Vključi datoteko ..."
-
-#: ../src/sendmsg-window.c:334
-msgid "Include a file"
-msgstr "Vključi datoteko"
-
-#: ../src/sendmsg-window.c:335
-msgid "_Attach File..."
-msgstr "_Priloži datoteko ..."
-
-#: ../src/sendmsg-window.c:336
-msgid "Attach a file"
-msgstr "Priloži datoteko"
-
-#: ../src/sendmsg-window.c:337
-msgid "I_nclude Message(s)"
-msgstr "_Vključi sporočila"
-
-#: ../src/sendmsg-window.c:338
-msgid "Include selected message(s)"
-msgstr "Vključi izbrana sporočila"
-
-#: ../src/sendmsg-window.c:339
-msgid "Attach _Message(s)"
-msgstr "Priloži _sporočila"
-
-#: ../src/sendmsg-window.c:340
-msgid "Attach selected message(s)"
-msgstr "Priloži izbrana sporočila"
-
-#: ../src/sendmsg-window.c:341
-msgid "_Save"
-msgstr "_Shrani"
-
-#: ../src/sendmsg-window.c:342
-msgid "Save this message"
-msgstr "Shrani to sporočilo"
-
-#: ../src/sendmsg-window.c:348
-msgid "Print the edited message"
-msgstr "Natisne urejeno sporočilo"
-
-#: ../src/sendmsg-window.c:351
-msgid "_Undo"
-msgstr "_Razveljavi"
-
-#: ../src/sendmsg-window.c:352
-msgid "Undo most recent change"
-msgstr "Razveljavi zadnjo spremembo"
-
-#: ../src/sendmsg-window.c:353
-msgid "_Redo"
-msgstr "_Uveljavi"
-
-#: ../src/sendmsg-window.c:354
-msgid "Redo most recent change"
-msgstr "Uveljavi zadnjo spremembo"
-
-#: ../src/sendmsg-window.c:355
-msgid "Cu_t"
-msgstr "I_zreži"
-
-#: ../src/sendmsg-window.c:356
-msgid "Cut the selected text"
-msgstr "Izreže izbrano besedilo"
-
-#: ../src/sendmsg-window.c:358
-msgid "Copy to the clipboard"
-msgstr "Kopira v odložišče"
-
-#: ../src/sendmsg-window.c:359
-msgid "_Paste"
-msgstr "_Prilepi"
-
-#: ../src/sendmsg-window.c:360
-msgid "Paste from the clipboard"
-msgstr "Prilepi iz odložišča"
-
-#: ../src/sendmsg-window.c:363
-msgid "_Wrap Body"
-msgstr "_Prelomi besedilo sporočila"
-
-#: ../src/sendmsg-window.c:365
-msgid "_Reflow Selected Text"
-msgstr "_Poveži izbrano besedilo"
-
-#: ../src/sendmsg-window.c:367
-msgid "Insert Si_gnature"
-msgstr "Vstavi po_dpis"
-
-#: ../src/sendmsg-window.c:369
-msgid "_Quote Message(s)"
-msgstr "_Navedi sporočilo"
-
-#: ../src/sendmsg-window.c:372
-#: ../src/sendmsg-window.c:414
-msgid "C_heck Spelling"
-msgstr "_Preveri črkovanje"
-
-#: ../src/sendmsg-window.c:373
-#: ../src/sendmsg-window.c:415
-msgid "Check the spelling of the message"
-msgstr "Preveri črkovanje sporočila"
-
-#: ../src/sendmsg-window.c:376
-msgid "Select _Identity..."
-msgstr "Izberi _istovetnost ..."
-
-#: ../src/sendmsg-window.c:377
-msgid "Select the Identity to use for the message"
-msgstr "Izbere istovetnost, ki bo uporabljena za sporočilo"
-
-#: ../src/sendmsg-window.c:380
-msgid "_Edit with Gnome-Editor"
-msgstr "_Uredi z urejevalnikom Gnome"
-
-#: ../src/sendmsg-window.c:381
-msgid "Edit the current message with the default Gnome editor"
-msgstr "Urejanje trenutnega sporočila s privzetim urejevalnikom Gnome"
-
-#. All three "Send" and "Queue" actions have the same
-#. * stock_id; the first in this list defines the action tied to the
-#. * toolbar's "Send" button, so "ToolbarSend" must come before
-#. * the others.
-#: ../src/sendmsg-window.c:392
-#: ../src/sendmsg-window.c:394
-msgid "Sen_d"
-msgstr "_Pošlji"
-
-#: ../src/sendmsg-window.c:393
-#: ../src/sendmsg-window.c:395
-msgid "Send this message"
-msgstr "Pošlji sporočilo"
-
-#: ../src/sendmsg-window.c:397
-msgid "_Queue"
-msgstr "Postavi v _vrsto"
-
-#: ../src/sendmsg-window.c:398
-#: ../src/sendmsg-window.c:404
-msgid "Queue this message in Outbox for sending"
-msgstr "Postavi sporočilo v vrsto za pošiljanje v odhodni predal"
-
-#: ../src/sendmsg-window.c:400
-msgid "_Postpone"
-msgstr "_Odloži"
-
-#: ../src/sendmsg-window.c:401
-msgid "Save this message and close"
-msgstr "Shrani sporočilo in zapre"
-
-#: ../src/sendmsg-window.c:403
-msgid "Send _Later"
-msgstr "Pošlji _kasneje"
-
-#: ../src/sendmsg-window.c:406
-msgid "Sa_ve and Close"
-msgstr "S_hrani in zapri"
-
-#: ../src/sendmsg-window.c:418
-msgid "Too_lbar"
-msgstr "O_rodna vrstica"
-
-#: ../src/sendmsg-window.c:420
-msgid "F_rom"
-msgstr "O_d"
-
-#: ../src/sendmsg-window.c:422
-msgid "Rec_ipients"
-msgstr "_Prejemniki"
-
-#: ../src/sendmsg-window.c:425
-msgid "R_eply To"
-msgstr "_Odgovori"
-
-#: ../src/sendmsg-window.c:428
-msgid "F_cc"
-msgstr "M_Kp"
-
-#: ../src/sendmsg-window.c:431
-msgid "_Request Disposition Notification"
-msgstr "_Zahtevaj obvestilo o prejetju"
-
-#: ../src/sendmsg-window.c:432
-msgid "Request Message Disposition Notification"
-msgstr "Zahteva obvestilo o prejetju sporočila"
-
-#: ../src/sendmsg-window.c:434
-msgid "_Format = Flowed"
-msgstr "_Oblika = Povezana"
-
-#. Send as message/alternative with text/plain and text/html parts
-#: ../src/sendmsg-window.c:437
-msgid "Send as plain text and _HTML"
-msgstr "Pošlji kot običajno besedilo in _HTML"
-
-#: ../src/sendmsg-window.c:441
-#: ../src/sendmsg-window.c:447
-msgid "_Sign Message"
-msgstr "_Podpiši sporočilo"
-
-#: ../src/sendmsg-window.c:442
-msgid "Sign message using GPG"
-msgstr "Podpiše sporočilo z GPG"
-
-#: ../src/sendmsg-window.c:443
-#: ../src/sendmsg-window.c:450
-msgid "_Encrypt Message"
-msgstr "_Šifriraj sporočilo"
-
-#: ../src/sendmsg-window.c:444
-msgid "Encrypt message using GPG"
-msgstr "Šifrira sporočilo z GPG"
-
-#: ../src/sendmsg-window.c:448
-msgid "signs the message using GnuPG"
-msgstr "podpiše sporočilo z GnuPG"
-
-#: ../src/sendmsg-window.c:452
-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:"
-
-#: ../src/sendmsg-window.c:462
-msgid "_GnuPG uses MIME mode"
-msgstr "_GnuPG uporablja način MIME"
-
-#: ../src/sendmsg-window.c:464
-msgid "_GnuPG uses old OpenPGP mode"
-msgstr "_GnuPG uporablja star način OpenPGP"
-
-#: ../src/sendmsg-window.c:467
-msgid "_S/MIME mode (GpgSM)"
-msgstr "_S/MIME način (GpgSM)"
-
-#: ../src/sendmsg-window.c:679
+#: ../src/sendmsg-window.c:269
 msgid "Attachment"
 msgstr "Priloga"
 
-#: ../src/sendmsg-window.c:679
+#: ../src/sendmsg-window.c:269
 msgid "Inline"
 msgstr "Medvrstično"
 
-#: ../src/sendmsg-window.c:679
+#: ../src/sendmsg-window.c:269
 msgid "Reference"
 msgstr "Sklic"
 
-#: ../src/sendmsg-window.c:920
+#: ../src/sendmsg-window.c:517
 msgid "(No name)"
 msgstr "(Brez imena)"
 
-#: ../src/sendmsg-window.c:926
-#, c-format
+#: ../src/sendmsg-window.c:523
+#, fuzzy, c-format
+#| msgid ""
+#| "The message to '%s' is modified.\n"
+#| "Save message to Draftbox?"
 msgid ""
-"The message to '%s' is modified.\n"
+"The message to “%s” is modified.\n"
 "Save message to Draftbox?"
 msgstr ""
 "Sporočilo '%s' je bilo spremenjeno.\n"
 "Naj bo shranjeno v predal osnutkov?"
 
-#: ../src/sendmsg-window.c:1220
+#: ../src/sendmsg-window.c:818
 msgid "Gnome editor is not defined in your preferred applications."
 msgstr "Gnome urejevalnik ni določen med priljubljenimi programi."
 
-#: ../src/sendmsg-window.c:1276
+#: ../src/sendmsg-window.c:891
 msgid "Select Identity"
 msgstr "Izbor istovetnosti"
 
-#: ../src/sendmsg-window.c:1753
-#, c-format
+#: ../src/sendmsg-window.c:1406
+#, fuzzy, c-format
+#| msgid ""
+#| "Saying yes will not send the file `%s' itself, but just a MIME message/"
+#| "external-body reference.  Note that the recipient must have proper "
+#| "permissions to see the `real' file.\n"
+#| "\n"
+#| "Do you really want to attach this file as reference?"
 msgid ""
-"Saying yes will not send the file `%s' itself, but just a MIME message/external-body reference.  Note that 
the recipient must have proper permissions to see the `real' file.\n"
+"Saying yes will not send the file “%s” itself, but just a MIME message/"
+"external-body reference. Note that the recipient must have proper "
+"permissions to see the “real” file.\n"
 "\n"
 "Do you really want to attach this file as reference?"
 msgstr ""
-"Odgovor 'da' ne bo poslal datoteke `%s', temveč le sporočilo MIME o zunajtelesnem sklicu.  Prejemnik mora 
imeti prava dovoljenja za ogled `prave' datoteke.\n"
+"Odgovor 'da' ne bo poslal datoteke `%s', temveč le sporočilo MIME o "
+"zunajtelesnem sklicu.  Prejemnik mora imeti prava dovoljenja za ogled "
+"`prave' datoteke.\n"
 "\n"
 "Ali zares želite priložiti to datoteko kot sklic?"
 
-#: ../src/sendmsg-window.c:1766
+#: ../src/sendmsg-window.c:1419
 msgid "Attach as Reference?"
 msgstr "Priloži kot sklic?"
 
-#: ../src/sendmsg-window.c:1859
-msgid "Choose charset"
-msgstr "Izberite znakovni nabor"
-
-#: ../src/sendmsg-window.c:1866
-#, c-format
+#: ../src/sendmsg-window.c:1552
+#, 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
+#, fuzzy, c-format
+#| msgid ""
+#| "File\n"
+#| "%s\n"
+#| "is not encoded in US-ASCII or UTF-8.\n"
+#| "Please choose the charset used to encode the file."
 msgid ""
 "File\n"
 "%s\n"
 "is not encoded in US-ASCII or UTF-8.\n"
-"Please choose the charset used to encode the file."
+"Please choose the character set used to encode the file."
 msgstr ""
 "Datoteka\n"
 "%s\n"
 "ni kodirana v naboru US-ASCII ali UTF-8.\n"
 "Izberite znakovni nabor za to datoteko."
 
-#: ../src/sendmsg-window.c:1886
+#: ../src/sendmsg-window.c:1580
 msgid "Attach as MIME type:"
 msgstr "Priloži kot vrsto MIME:"
 
-#: ../src/sendmsg-window.c:1942
-#, c-format
-msgid "Character set for file %s changed from \"%s\" to \"%s\"."
-msgstr "Znakovni nabor za datoteko %s je bil spremenjen iz \"%s\" v \"%s\"."
+#: ../src/sendmsg-window.c:1641
+#, 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"
 
-#: ../src/sendmsg-window.c:1985
-#: ../src/sendmsg-window.c:5706
+#: ../src/sendmsg-window.c:1684 ../src/sendmsg-window.c:5033
 msgid "(no subject)"
 msgstr "(brez zadeve)"
 
-#: ../src/sendmsg-window.c:2023
+#: ../src/sendmsg-window.c:1722
 #, c-format
 msgid "Cannot create file URI object for %s"
-msgstr "Ni mogoče ustvariti predmeta URI-ja datoteke za %s"
+msgstr "Ni mogoče ustvariti predmeta URI datoteke za %s"
 
-#: ../src/sendmsg-window.c:2031
+#: ../src/sendmsg-window.c:1730
 msgid "unknown error"
 msgstr "neznana napaka"
 
-#: ../src/sendmsg-window.c:2078
+#: ../src/sendmsg-window.c:1770
 msgid "forwarded message"
 msgstr "posredovano sporočilo"
 
-#: ../src/sendmsg-window.c:2083
-#, c-format
-msgid "Message from %s, subject: \"%s\""
-msgstr "Sporočilo od %s, zadeva: \"%s\""
+#: ../src/sendmsg-window.c:1775
+#, 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:2159
-#: ../src/sendmsg-window.c:2232
+#: ../src/sendmsg-window.c:1853 ../src/sendmsg-window.c:1926
 msgid "Remove"
 msgstr "Odstrani"
 
-#: ../src/sendmsg-window.c:2244
-msgid "Open..."
-msgstr "Odpri ..."
+#: ../src/sendmsg-window.c:1938
+#, fuzzy
+#| msgid "_Open"
+msgid "Open…"
+msgstr "&Odpri"
 
-#: ../src/sendmsg-window.c:2256
+#: ../src/sendmsg-window.c:1950
 msgid "(URL)"
 msgstr "(URL)"
 
-#: ../src/sendmsg-window.c:2314
+#: ../src/sendmsg-window.c:2006
 msgid "Attach file"
 msgstr "Priloži datoteko"
 
-#: ../src/sendmsg-window.c:2415
-#: ../src/sendmsg-window.c:2525
-#: ../src/sendmsg-window.c:4965
+#: ../src/sendmsg-window.c:2119 ../src/sendmsg-window.c:2222
+#: ../src/sendmsg-window.c:6857
 msgid ""
 "Attaching message failed.\n"
 "Possible reason: not enough temporary space"
@@ -6744,154 +6517,160 @@ msgstr ""
 "Prilaganje sporočila ni uspelo.\n"
 "Mogoč vzrok: ni dovolj začasnega prostora"
 
-#: ../src/sendmsg-window.c:2758
+#: ../src/sendmsg-window.c:2441
 msgid "F_rom:"
 msgstr "O_d:"
 
 #. Subject:
-#: ../src/sendmsg-window.c:2896
+#: ../src/sendmsg-window.c:2591
 msgid "S_ubject:"
 msgstr "_Zadeva:"
 
-#. fcc: mailbox folder where the message copy will be written to
-#: ../src/sendmsg-window.c:2907
-msgid "F_cc:"
-msgstr "M_Kp:"
+#: ../src/sendmsg-window.c:2618
+#, fuzzy
+msgid "F_CC:"
+msgstr "_Kp:"
 
 #. Attachment list
-#: ../src/sendmsg-window.c:2936
+#: ../src/sendmsg-window.c:2644
 msgid "_Attachments:"
 msgstr "_Priloge:"
 
-#: ../src/sendmsg-window.c:2985
+#: ../src/sendmsg-window.c:2688
 msgid "Mode"
 msgstr "Način"
 
-#: ../src/sendmsg-window.c:3330
+#: ../src/sendmsg-window.c:3034
 #, c-format
 msgid "Could not save attachment: %s"
 msgstr "Ni mogoče shraniti priloge: %s"
 
-#: ../src/sendmsg-window.c:3354
+#: ../src/sendmsg-window.c:3058
 msgid "No subject"
 msgstr "Brez zadeve"
 
-#: ../src/sendmsg-window.c:3387
-#, c-format
-msgid "inlined file \"%s\" (%s)"
-msgstr "medvrstična datoteka \"%s\" (%s)"
+#: ../src/sendmsg-window.c:3092
+#, fuzzy, c-format
+#| msgid "inlined file \"%s\" (%s)"
+msgid "inlined file “%s” (%s)"
+msgstr "medvrstični del %s"
 
-#: ../src/sendmsg-window.c:3390
-#, c-format
-msgid "attached file \"%s\" (%s)"
-msgstr "priložena datoteka \"%s\" (%s)"
+#: ../src/sendmsg-window.c:3095
+#, 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:3394
+#: ../src/sendmsg-window.c:3099
 #, c-format
 msgid "inlined %s part"
 msgstr "medvrstični del %s"
 
-#: ../src/sendmsg-window.c:3396
+#: ../src/sendmsg-window.c:3101
 #, c-format
 msgid "attached %s part"
 msgstr "priložen del %s"
 
-#: ../src/sendmsg-window.c:3464
-#, c-format
-msgid "message from %s, subject \"%s\""
-msgstr "sporočilo od %s, zadeva \"%s\""
+#: ../src/sendmsg-window.c:3168
+#, 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:3591
+#: ../src/sendmsg-window.c:3295
 msgid "quoted"
 msgstr "navedeno"
 
-#: ../src/sendmsg-window.c:3596
-#: ../src/sendmsg-window.c:3599
+#: ../src/sendmsg-window.c:3300 ../src/sendmsg-window.c:3303
 msgid "quoted attachment"
 msgstr "navedena priloga"
 
-#: ../src/sendmsg-window.c:3625
+#: ../src/sendmsg-window.c:3329
 msgid "Select parts for quotation"
 msgstr "Izbor delov za navajanje"
 
-#: ../src/sendmsg-window.c:3634
+#: ../src/sendmsg-window.c:3340
 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:3776
+#: ../src/sendmsg-window.c:3493
 msgid "you"
 msgstr "vi"
 
-#: ../src/sendmsg-window.c:3785
+#: ../src/sendmsg-window.c:3502
 #, c-format
 msgid "------forwarded message from %s------\n"
 msgstr "------ posredovano sporočilo od %s ------\n"
 
-#: ../src/sendmsg-window.c:3822
+#: ../src/sendmsg-window.c:3539
 #, c-format
 msgid "Message-ID: %s\n"
 msgstr "Id sporočila: %s\n"
 
-#: ../src/sendmsg-window.c:3828
+#: ../src/sendmsg-window.c:3545
 msgid "References:"
 msgstr "Sklici:"
 
-#: ../src/sendmsg-window.c:3839
+#: ../src/sendmsg-window.c:3556
 #, c-format
 msgid "On %s, %s wrote:\n"
 msgstr "Dne, %s je %s napisal(a):\n"
 
-#: ../src/sendmsg-window.c:3841
+#: ../src/sendmsg-window.c:3558
 #, c-format
 msgid "%s wrote:\n"
 msgstr "%s je napisal(a):\n"
 
-#: ../src/sendmsg-window.c:3951
+#: ../src/sendmsg-window.c:3671
 msgid "No signature found!"
 msgstr "Ni mogoče najti podpisa!"
 
-#: ../src/sendmsg-window.c:4139
+#: ../src/sendmsg-window.c:3812
 msgid "Could not save message."
 msgstr "Ni mogoče shraniti sporočila."
 
-#: ../src/sendmsg-window.c:4146
+#: ../src/sendmsg-window.c:3819
 #, c-format
 msgid "Could not open draftbox: %s"
 msgstr "Ni mogoče odpreti predala osnutkov: %s"
 
-#: ../src/sendmsg-window.c:4171
+#: ../src/sendmsg-window.c:3844
 msgid "Message saved."
 msgstr "Sporočilo je shranjeno."
 
-#: ../src/sendmsg-window.c:5145
-#: ../src/sendmsg-window.c:5153
-#: ../src/sendmsg-window.c:5160
-#: ../src/sendmsg-window.c:5167
-#: ../src/sendmsg-window.c:5191
+#: ../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
 #, c-format
 msgid "Could not attach the file %s: %s."
 msgstr "Ni mogoče priložiti datoteke %s: %s"
 
-#: ../src/sendmsg-window.c:5146
+#: ../src/sendmsg-window.c:4470
 msgid "not an absolute path"
 msgstr "ni absolutna pot"
 
-#: ../src/sendmsg-window.c:5154
+#: ../src/sendmsg-window.c:4478
 msgid "not in your directory"
 msgstr "ni v vaši mapi"
 
-#: ../src/sendmsg-window.c:5161
+#: ../src/sendmsg-window.c:4485
 msgid "does not exist"
 msgstr "ne obstaja"
 
-#: ../src/sendmsg-window.c:5192
+#: ../src/sendmsg-window.c:4516
 msgid "not in current directory"
 msgstr "ni v trenutni mapi"
 
-#: ../src/sendmsg-window.c:5242
+#: ../src/sendmsg-window.c:4566
+#, fuzzy
+#| msgid ""
+#| "The link that you selected created\n"
+#| "a \"Blind copy\" (Bcc) address.\n"
+#| "Please check that the address\n"
+#| "is appropriate."
 msgid ""
 "The link that you selected created\n"
-"a \"Blind copy\" (Bcc) address.\n"
+"a “Blind copy” (BCC) address.\n"
 "Please check that the address\n"
 "is appropriate."
 msgstr ""
@@ -6900,98 +6679,120 @@ msgstr ""
 "Preverite, če je naslov\n"
 "primeren."
 
-#: ../src/sendmsg-window.c:5326
-#, c-format
-msgid "Could not open the file %s.\n"
-msgstr "Datoteke %s ni mogoče odpreti.\n"
+#: ../src/sendmsg-window.c:4675
+#, 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."
 
-#: ../src/sendmsg-window.c:5374
+#: ../src/sendmsg-window.c:4694
 msgid "Include file"
 msgstr "Vključi datoteko"
 
 #. Translators: please do not translate Face.
-#: ../src/sendmsg-window.c:5560
+#: ../src/sendmsg-window.c:4879
 #, 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:5563
+#: ../src/sendmsg-window.c:4882
 #, 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:5690
+#: ../src/sendmsg-window.c:4990
+#, fuzzy
+#| msgid "No subject"
+msgid "No Subject"
+msgstr "Brez zadeve"
+
+#: ../src/sendmsg-window.c:4995
+msgid "_Send"
+msgstr "_Pošlji"
+
+#: ../src/sendmsg-window.c:5016
 msgid "You did not specify a subject for this message"
 msgstr "Zadeve sporočila niste navedli"
 
-#: ../src/sendmsg-window.c:5691
+#: ../src/sendmsg-window.c:5017
 msgid "If you would like to provide one, enter it below."
 msgstr "Če jo želite navesti, jo vpišite spodaj."
 
-#: ../src/sendmsg-window.c:5741
-msgid "_Send"
-msgstr "_Pošlji"
-
-#: ../src/sendmsg-window.c:5824
+#: ../src/sendmsg-window.c:5110
 #, c-format
-msgid "You did not select encryption for this message, although %s public keys are available for all 
recipients. In order to protect your privacy, the message could be %s encrypted."
-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."
+msgid ""
+"You did not select encryption for this message, although %s public keys are "
+"available for all recipients. In order to protect your privacy, the message "
+"could be %s encrypted."
+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:5851
+#: ../src/sendmsg-window.c:5132
 msgid "Send _encrypted"
 msgstr "Pošlji _šifrirano"
 
-#: ../src/sendmsg-window.c:5869
+#: ../src/sendmsg-window.c:5147
 msgid "Send _unencrypted"
 msgstr "Pošlji _nešifrirano"
 
-#: ../src/sendmsg-window.c:5932
+#: ../src/sendmsg-window.c:5207
 msgid "You selected OpenPGP security for this message.\n"
 msgstr "Za to sporočilo ste izbrali varnost OpenPGP.\n"
 
-#: ../src/sendmsg-window.c:5937
-msgid "The message text will be sent as plain text and as HTML, but only the plain part can be signed.\n"
-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:5212
+msgid ""
+"The message text will be sent as plain text and as HTML, but only the plain "
+"part can be signed.\n"
+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:5942
-msgid "The message contains attachments, which cannot be signed or encrypted.\n"
+#: ../src/sendmsg-window.c:5217
+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:5946
-msgid "You should select MIME mode if the complete message shall be protected. Do you really want to 
proceed?"
-msgstr "V primeru, da želite zaščititi celotno sporočilo morate izbrati način MIME. Ali resnično želite 
nadaljevati?"
+#: ../src/sendmsg-window.c:5221
+msgid ""
+"You should select MIME mode if the complete message shall be protected. Do "
+"you really want to proceed?"
+msgstr ""
+"V primeru, da želite zaščititi celotno sporočilo morate izbrati način MIME. "
+"Ali resnično želite nadaljevati?"
 
-#: ../src/sendmsg-window.c:5971
-#, c-format
-msgid "sending message with gpg mode %d"
-msgstr "pošiljanje sporočila v gpg načinu %d"
+#: ../src/sendmsg-window.c:5246
+#, 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:6008
+#: ../src/sendmsg-window.c:5274
 msgid "Message could not be created"
 msgstr "Sporočila ni mogoče ustvariti"
 
-#: ../src/sendmsg-window.c:6010
+#: ../src/sendmsg-window.c:5276
 msgid "Message could not be queued in outbox"
 msgstr "Sporočila ni mogoče dati v vrsto v odhodni predal"
 
-#: ../src/sendmsg-window.c:6012
+#: ../src/sendmsg-window.c:5278
 msgid "Message could not be saved in sentbox"
 msgstr "Sporočila ni mogoče shraniti v poslano pošto"
 
-#: ../src/sendmsg-window.c:6014
+#: ../src/sendmsg-window.c:5280
 msgid "Message could not be sent"
 msgstr "Sporočila ni mogoče poslati"
 
-#: ../src/sendmsg-window.c:6017
+#: ../src/sendmsg-window.c:5283
 msgid "Message could not be signed"
 msgstr "Sporočila ni mogoče podpisati"
 
-#: ../src/sendmsg-window.c:6019
+#: ../src/sendmsg-window.c:5285
 msgid "Message could not be encrypted"
 msgstr "Sporočila ni mogoče šifrirati"
 
-#: ../src/sendmsg-window.c:6025
+#: ../src/sendmsg-window.c:5291
 #, c-format
 msgid ""
 "Send failed: %s\n"
@@ -7000,137 +6801,116 @@ msgstr ""
 "Pošiljanje je spodletelo: %s\n"
 "%s"
 
-#: ../src/sendmsg-window.c:6030
+#: ../src/sendmsg-window.c:5296
 #, c-format
 msgid "Send failed: %s"
 msgstr "Pošiljanje je spodletelo: %s"
 
-#: ../src/sendmsg-window.c:6121
+#: ../src/sendmsg-window.c:5395
 #, c-format
 msgid "Could not postpone message: %s"
 msgstr "Ni mogoče odložiti pošiljanja sporočila: %s"
 
-#: ../src/sendmsg-window.c:6138
+#: ../src/sendmsg-window.c:5416
 msgid "Message postponed."
 msgstr "Pošiljanje sporočila je bilo odloženo."
 
-#: ../src/sendmsg-window.c:6143
+#: ../src/sendmsg-window.c:5421
 msgid "Could not postpone message."
 msgstr "Pošiljanja sporočila ni mogoče odložiti."
 
-#: ../src/sendmsg-window.c:6296
+#: ../src/sendmsg-window.c:5633
 #, c-format
 msgid "Error starting spell checker: %s"
 msgstr "Napaka med zagonom črkovalnika: %s"
 
-#: ../src/sendmsg-window.c:6463
-#, c-format
-msgid "Could not compile %s"
-msgstr "Ni mogoče prevesti %s"
-
-#: ../src/sendmsg-window.c:6464
-msgid "Quoted Text Regular Expression"
-msgstr "Logični izraz navedenega besedila"
-
-#: ../src/sendmsg-window.c:6971
+#: ../src/sendmsg-window.c:6382
 #, c-format
 msgid "Reply to %s: %s"
 msgstr "Odgovori osebi %s: %s"
 
-#: ../src/sendmsg-window.c:6976
+#: ../src/sendmsg-window.c:6387
 #, c-format
 msgid "Forward message to %s: %s"
 msgstr "Posreduj sporočilo osebi %s: %s"
 
-#: ../src/sendmsg-window.c:6980
+#: ../src/sendmsg-window.c:6391
 #, c-format
 msgid "New message to %s: %s"
 msgstr "Novo sporočilo za %s: %s"
 
-#: ../src/spell-check.c:513
-msgid "_Change"
-msgstr "_Spremeni"
+#: ../src/sendmsg-window.c:6556
+msgid "_Language"
+msgstr "_Jezik"
+
+#: ../src/spell-check.c:211
+msgid "Spell check"
+msgstr "Preverjanje črkovanja"
+
+#: ../src/spell-check.c:339
+msgid "C_hange"
+msgstr "S_premeni"
 
-#: ../src/spell-check.c:515
+#: ../src/spell-check.c:341
 msgid "Replace the current word with the selected suggestion"
 msgstr "Zamenja trenutno besedilo z izbranim predlogom"
 
-#: ../src/spell-check.c:520
+#: ../src/spell-check.c:347
 msgid "Change _All"
 msgstr "Spremeni _vse"
 
-#: ../src/spell-check.c:522
-msgid "Replace all occurrences of the current word with the selected suggestion"
+#: ../src/spell-check.c:349
+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:531
+#: ../src/spell-check.c:355
 msgid "_Ignore"
 msgstr "_Prezri"
 
-#: ../src/spell-check.c:534
+#: ../src/spell-check.c:357
 msgid "Skip the current word"
 msgstr "Preskoči trenutno besedo"
 
-#: ../src/spell-check.c:538
-msgid "Ignore A_ll"
-msgstr "Prezri _vse"
+#: ../src/spell-check.c:362
+#, fuzzy
+#| msgid "Ignore A_ll"
+msgid "I_gnore All"
+msgstr "_Prezri napake potrdila SSL"
 
-#: ../src/spell-check.c:540
+#: ../src/spell-check.c:364
 msgid "Skip all occurrences of the current word"
 msgstr "Preskoči vse pojavitve trenutne besede"
 
-#: ../src/spell-check.c:546
+#: ../src/spell-check.c:369
 msgid "_Learn"
 msgstr "_Nauči se"
 
-#: ../src/spell-check.c:548
+#: ../src/spell-check.c:371
 msgid "Add the current word to your personal dictionary"
 msgstr "Doda trenutno besedo v osebni slovarček"
 
-#: ../src/spell-check.c:553
+#: ../src/spell-check.c:376
 msgid "_Done"
 msgstr "_Končano"
 
-#: ../src/spell-check.c:554
+#: ../src/spell-check.c:377
 msgid "Finish spell checking"
 msgstr "Konča preverjanje črkovanja"
 
-#: ../src/spell-check.c:559
+#: ../src/spell-check.c:384
 msgid "Revert all changes and finish spell checking"
 msgstr "Povrni vse spremembe in končaj preverjanje črkovanja"
 
-#: ../src/spell-check.c:588
-msgid "Spell check"
-msgstr "Preverjanje črkovanja"
-
-#: ../src/spell-check.c:866
-msgid "BalsaSpellCheck: Quoted text regular expression compilation failed\n"
-msgstr "Preverjanje črkovanja: prevajanje logičnega izraza navedenega besedila je spodletelo\n"
-
-#: ../src/spell-check.c:990
-#, c-format
-msgid ""
-"BalsaSpellCheck: Learn operation failed;\n"
-"%s\n"
+#: ../src/spell-check.c:1018
+#, fuzzy, c-format
+#| msgid "BalsaSpellCheck: Pspell Error: %s\n"
+msgid "BalsaSpellCheck: Enchant Error: %s\n"
 msgstr ""
-"Preverjanje črkovanja: opravilo učenja je spodletelo;\n"
-"%s\n"
+"Pot: »%s«\n"
+"Napaka: %s"
 
-#: ../src/spell-check.c:996
-msgid "BalsaSpellCheck: Learn operation failed.\n"
-msgstr "Preverjanje črkovanja: opravilo učenja je spodletelo.\n"
-
-#: ../src/spell-check.c:1195
-#, c-format
-msgid "BalsaSpellCheck: Suggest %s (%s)\n"
-msgstr "Preverjanje črkovanja: predlog %s (%s)\n"
-
-#: ../src/spell-check.c:1297
-#, c-format
-msgid "BalsaSpellCheck: Pspell Error: %s\n"
-msgstr "Preverjanje črkovanja: napaka psspell: %s\n"
-
-#: ../src/store-address.c:109
+#: ../src/store-address.c:104
 msgid "Store address: no addresses"
 msgstr "Shrani naslov: ni naslovov"
 
@@ -7138,63 +6918,79 @@ msgstr "Shrani naslov: ni naslovov"
 msgid "Store Address"
 msgstr "Shrani naslov"
 
-#: ../src/store-address.c:225
-msgid "Save this address and close the dialog?"
-msgstr "Ali naj bo ta naslov shranjen in pogovorno okno zaprto?"
-
-#: ../src/store-address.c:243
-msgid "No address book selected...."
-msgstr "Ni izbranega imenika ..."
+#: ../src/store-address.c:246
+#, fuzzy
+#| msgid "No address book selected...."
+msgid "No address book selected…"
+msgstr "Izbriše izbrani imenik"
 
-#: ../src/store-address.c:256
+#: ../src/store-address.c:259
 msgid "Address could not be written to this address book."
 msgstr "Naslova ni mogoče zapisati v ta imenik."
 
-#: ../src/store-address.c:259
+#: ../src/store-address.c:262
 msgid "Address book could not be accessed."
 msgstr "Dostop do imenika ni mogoč."
 
-#: ../src/store-address.c:261
+#: ../src/store-address.c:264
 msgid "This mail address is already in this address book."
 msgstr "Ta elektronski naslov je že v imeniku."
 
-#: ../src/store-address.c:264
+#: ../src/store-address.c:267
 msgid "Unexpected address book error. Report it."
 msgstr "Nepričakovana napaka v imeniku. Pošljite poročilo."
 
-#: ../src/store-address.c:280
-msgid "Choose Address Book"
-msgstr "Izbor imenika"
+#: ../src/store-address.c:290
+#, fuzzy
+#| msgid "Address Book"
+msgid "Address Book:"
+msgstr "_Imenik"
+
+#: ../src/store-address.c:336
+#, fuzzy
+#| msgid "From:"
+msgid "From: "
+msgstr "_Od:"
+
+#: ../src/store-address.c:337
+msgid "To: "
+msgstr "Za:"
 
-#: ../src/store-address.c:319
-msgid "Choose Address"
-msgstr "Izbor naslova"
+#: ../src/store-address.c:338
+#, fuzzy
+msgid "CC: "
+msgstr "_Kp:"
+
+#: ../src/store-address.c:339
+#, fuzzy
+msgid "BCC: "
+msgstr "_Skp:"
 
-#: ../src/toolbar-factory.c:133
+#: ../src/toolbar-factory.c:140
 msgid "Separator"
 msgstr "Ločnica"
 
-#: ../src/toolbar-factory.c:134
+#: ../src/toolbar-factory.c:141
 msgid "Quit"
 msgstr "Končaj"
 
-#: ../src/toolbar-factory.c:135
+#: ../src/toolbar-factory.c:142
 msgid "Check"
 msgstr "Preveri"
 
-#: ../src/toolbar-factory.c:136
+#: ../src/toolbar-factory.c:143
 msgid "Compose"
 msgstr "Sestavi"
 
-#: ../src/toolbar-factory.c:137
+#: ../src/toolbar-factory.c:144
 msgid "Continue"
 msgstr "Nadaljuj"
 
-#: ../src/toolbar-factory.c:138
+#: ../src/toolbar-factory.c:145
 msgid "Reply"
 msgstr "Odgovori"
 
-#: ../src/toolbar-factory.c:139
+#: ../src/toolbar-factory.c:146
 msgid ""
 "Reply\n"
 "to all"
@@ -7202,7 +6998,7 @@ msgstr ""
 "Odgovori\n"
 "vsem"
 
-#: ../src/toolbar-factory.c:140
+#: ../src/toolbar-factory.c:147
 msgid ""
 "Reply\n"
 "to group"
@@ -7210,11 +7006,11 @@ msgstr ""
 "Odgovori\n"
 "skupini"
 
-#: ../src/toolbar-factory.c:141
+#: ../src/toolbar-factory.c:148
 msgid "Forward"
 msgstr "Posreduj"
 
-#: ../src/toolbar-factory.c:144
+#: ../src/toolbar-factory.c:151
 msgid ""
 "Next\n"
 "unread"
@@ -7222,7 +7018,7 @@ msgstr ""
 "Naslednje\n"
 "neprebrano"
 
-#: ../src/toolbar-factory.c:145
+#: ../src/toolbar-factory.c:152
 msgid ""
 "Next\n"
 "flagged"
@@ -7230,7 +7026,7 @@ msgstr ""
 "Naslednje\n"
 "z zastavico"
 
-#: ../src/toolbar-factory.c:146
+#: ../src/toolbar-factory.c:153
 msgid ""
 "Previous\n"
 "part"
@@ -7238,7 +7034,7 @@ msgstr ""
 "Predhodni\n"
 "del"
 
-#: ../src/toolbar-factory.c:147
+#: ../src/toolbar-factory.c:154
 msgid ""
 "Next\n"
 "part"
@@ -7246,7 +7042,7 @@ msgstr ""
 "Naslednji\n"
 "del"
 
-#: ../src/toolbar-factory.c:148
+#: ../src/toolbar-factory.c:155
 msgid ""
 "Trash /\n"
 "Delete"
@@ -7254,15 +7050,15 @@ msgstr ""
 "Smeti /\n"
 "Izbriši"
 
-#: ../src/toolbar-factory.c:149
+#: ../src/toolbar-factory.c:156
 msgid "Postpone"
 msgstr "Odloži"
 
-#: ../src/toolbar-factory.c:150
+#: ../src/toolbar-factory.c:157
 msgid "Print"
 msgstr "Natisni"
 
-#: ../src/toolbar-factory.c:151
+#: ../src/toolbar-factory.c:158
 msgid ""
 "Request\n"
 "MDN"
@@ -7270,31 +7066,37 @@ msgstr ""
 "Zahtevaj\n"
 "sporočilo o prejemu"
 
-#: ../src/toolbar-factory.c:152
+#: ../src/toolbar-factory.c:159
 msgid "Send"
 msgstr "Pošlji"
 
-#: ../src/toolbar-factory.c:153
+#: ../src/toolbar-factory.c:160
+#, fuzzy
+#| msgid "_Send Queued Mail"
+msgid "Send queued"
+msgstr "Pošlje čakajočo pošto in prejme novo"
+
+#: ../src/toolbar-factory.c:161
 msgid "Exchange"
 msgstr "Exchange"
 
-#: ../src/toolbar-factory.c:154
+#: ../src/toolbar-factory.c:162 ../src/toolbar-factory.c:194
+msgid "Queue"
+msgstr "Daj v vrsto"
+
+#: ../src/toolbar-factory.c:163
 msgid "Attach"
 msgstr "Priloži"
 
-#: ../src/toolbar-factory.c:155
+#: ../src/toolbar-factory.c:164
 msgid "Save"
 msgstr "Shrani"
 
-#: ../src/toolbar-factory.c:156
+#: ../src/toolbar-factory.c:165
 msgid "Identity"
 msgstr "Istovetnost"
 
-#: ../src/toolbar-factory.c:158
-msgid "Close"
-msgstr "Zapri"
-
-#: ../src/toolbar-factory.c:159
+#: ../src/toolbar-factory.c:168
 msgid ""
 "Toggle\n"
 "new"
@@ -7302,11 +7104,19 @@ msgstr ""
 "Preklopi\n"
 "novo"
 
-#: ../src/toolbar-factory.c:160
+#: ../src/toolbar-factory.c:169
 msgid "Mark all"
 msgstr "Označi vse"
 
-#: ../src/toolbar-factory.c:162
+#: ../src/toolbar-factory.c:170
+msgid ""
+"All\n"
+"headers"
+msgstr ""
+"Vse\n"
+"glave"
+
+#: ../src/toolbar-factory.c:171
 msgid ""
 "Reset\n"
 "Filter"
@@ -7314,27 +7124,33 @@ msgstr ""
 "Ponastavi\n"
 "filter"
 
-#: ../src/toolbar-factory.c:165
+#: ../src/toolbar-factory.c:172
+#, fuzzy
+#| msgid "Msg Preview"
+msgid "Message Preview"
+msgstr "Pokaži _predogled sporočila"
+
+#: ../src/toolbar-factory.c:174
 msgid "Sign"
 msgstr "Podpiši"
 
-#: ../src/toolbar-factory.c:166
+#: ../src/toolbar-factory.c:175
 msgid "Encrypt"
 msgstr "Å ifriraj"
 
-#: ../src/toolbar-factory.c:168
+#: ../src/toolbar-factory.c:177
 msgid "Undo"
 msgstr "Razveljavi"
 
-#: ../src/toolbar-factory.c:169
+#: ../src/toolbar-factory.c:178
 msgid "Redo"
 msgstr "Ponovi"
 
-#: ../src/toolbar-factory.c:170
+#: ../src/toolbar-factory.c:179
 msgid "Expunge"
 msgstr "Uniči"
 
-#: ../src/toolbar-factory.c:171
+#: ../src/toolbar-factory.c:180
 msgid ""
 "Empty\n"
 "Trash"
@@ -7342,99 +7158,1239 @@ msgstr ""
 "Izprazni\n"
 "smeti"
 
-#: ../src/toolbar-factory.c:172
+#: ../src/toolbar-factory.c:181
 msgid "Edit"
 msgstr "Uredi"
 
-#: ../src/toolbar-factory.c:185
-msgid "Queue"
-msgstr "Daj v vrsto"
-
-#: ../src/toolbar-factory.c:390
-#, c-format
-msgid "Unknown toolbar icon \"%s\""
-msgstr "Neznana ikona orodne vrstice \"%s\""
+#: ../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"
 
-#: ../src/toolbar-factory.c:461
+#: ../src/toolbar-factory.c:484
 msgid "Queue this message for sending"
 msgstr "Premakni sporočilo v vrsto za pošiljanje"
 
-#: ../src/toolbar-factory.c:519
+#: ../src/toolbar-factory.c:496
 msgid "Text Be_low Icons"
 msgstr "Besedilo _pod ikonami"
 
-#: ../src/toolbar-factory.c:520
+#: ../src/toolbar-factory.c:497
 msgid "Priority Text Be_side Icons"
 msgstr "Prednostno besedilo _ob ikonah"
 
-#: ../src/toolbar-factory.c:522
+#: ../src/toolbar-factory.c:499
 msgid "_Icons Only"
 msgstr "Le _ikone"
 
-#: ../src/toolbar-factory.c:523
+#: ../src/toolbar-factory.c:500
 msgid "_Text Only"
 msgstr "_Le besedilo"
 
-#: ../src/toolbar-factory.c:746
+#: ../src/toolbar-factory.c:764
 #, c-format
 msgid "Use Desktop _Default (%s)"
 msgstr "Uporabi _privzeto namizje (%s)"
 
-#: ../src/toolbar-factory.c:776
-msgid "_Customize Toolbars..."
-msgstr "_Prilagodi orodne vrstice ..."
+#: ../src/toolbar-factory.c:790
+#, fuzzy
+#| msgid "Customize Toolbars"
+msgid "_Customize Toolbars…"
+msgstr "Prilagodi orodne vrstice"
 
-#: ../src/toolbar-prefs.c:138
+#: ../src/toolbar-prefs.c:136
 msgid "Customize Toolbars"
 msgstr "Prilagodi orodne vrstice"
 
-#: ../src/toolbar-prefs.c:175
+#: ../src/toolbar-prefs.c:181
 msgid "Compose window"
 msgstr "Sestavljalno okno"
 
-#: ../src/toolbar-prefs.c:184
+#: ../src/toolbar-prefs.c:194
 msgid "Toolbar options"
 msgstr "Možnosti orodne vrstice"
 
-#: ../src/toolbar-prefs.c:193
+#: ../src/toolbar-prefs.c:203
 msgid "_Wrap button labels"
 msgstr "_Prelomi oznake gumbov"
 
-#: ../src/toolbar-prefs.c:408
+#: ../src/toolbar-prefs.c:386
 #, 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:444
+#: ../src/toolbar-prefs.c:422
 msgid "Preview"
 msgstr "Predogled"
 
-#: ../src/toolbar-prefs.c:481
+#: ../src/toolbar-prefs.c:452
 msgid "_Restore toolbar to standard buttons"
 msgstr "_Obnovi orodno vrstico na običajne gumbe"
 
 #. Style button
-#: ../src/toolbar-prefs.c:485
-msgid "Toolbar _style..."
-msgstr "_Slog orodne vrstice ..."
+#: ../src/toolbar-prefs.c:456
+#, fuzzy
+#| msgid "Toolbar _style..."
+msgid "Toolbar _style…"
+msgstr "Slog orodne vrstice"
 
-#: ../src/toolbar-prefs.c:502
+#: ../src/toolbar-prefs.c:473
 msgid "Available buttons"
 msgstr "Razpoložljivi gumbi"
 
-#: ../src/toolbar-prefs.c:518
+#: ../src/toolbar-prefs.c:489
 msgid "Current toolbar"
 msgstr "Trenutna orodna vrstica"
 
+#: ../src/toolbar-prefs.c:510
+#, fuzzy
+#| msgid "Cut the selected text"
+msgid "Move selected item up"
+msgstr "Premakne izbrani predmet na orodni vrstici"
+
+#: ../src/toolbar-prefs.c:520
+#, fuzzy
+#| msgid "Save selected to folder..."
+msgid "Remove selected item from toolbar"
+msgstr "Odstrani izbrani predmet iz orodne vrstice"
+
+#: ../src/toolbar-prefs.c:528
+#, fuzzy
+msgid "Add selected item to toolbar"
+msgstr "Odstrani izbrani predmet iz orodne vrstice"
+
 #: ../src/toolbar-prefs.c:535
-msgid "Up"
-msgstr "Navzgor"
+#, fuzzy
+#| msgid "Save selected to folder..."
+msgid "Move selected item down"
+msgstr "Pomakni trenutno masko nižje"
+
+#~ msgid "Bcc:"
+#~ msgstr "Skp:"
+
+#~ msgid "Cc"
+#~ msgstr "Kp"
+
+#~ msgid ",%s"
+#~ msgstr ",%s"
+
+#~ msgid "Error reading signature from %s"
+#~ msgstr "Napaka med branjem podpisa iz %s"
+
+#~ msgid "_Bcc:"
+#~ msgstr "_Skp:"
+
+#~ msgid "%s: %s"
+#~ msgstr "%s: %s"
+
+#~ msgid ""
+#~ "%s: a key with id %s is present, but it is expired, disabled, revoked or "
+#~ "invalid"
+#~ msgstr ""
+#~ "%s: ključ z id %s je prisoten, vendar je potekel, onemogočen, preklican "
+#~ "ali pa neveljaven"
+
+#~ msgid "%s: could not find a key with id %s"
+#~ msgstr "%s: ni mogoče najti ključa z ID %s"
+
+#~ msgid "The validity of the key with user ID \"%s\" is \"%s\"."
+#~ msgstr "Veljavnost ključa z uporabniškim ID \"%s\" je \"%s\"."
+
+#~ msgid "Use this key anyway?"
+#~ msgstr "Ali naj želite vseeno uporabiti ključ?"
+
+#~ msgid "Retrieving Message %d of %d"
+#~ msgstr "Pridobivanje sporočila %d od %d"
+
+#~ msgid "Received %ld kB of %ld"
+#~ msgstr "Prejeto %ld kB od %ld"
+
+#~ msgid "Saving POP message to %s failed."
+#~ msgstr "Shranjevanje sporočila POP v %s je spodletelo."
+
+#~ msgid ""
+#~ "POP3 mailbox %s temp file error:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "POP3 poštni predal %s napaka začasne datoteke:\n"
+#~ "%s"
+
+#~ msgid "POP3 error: cannot open %s for writing."
+#~ msgstr "Napaka POP3: %s ni mogoče odpreti za pisanje."
+
+#~ msgid "POP3 error: cannot close %s."
+#~ msgstr "Napaka POP3: ni mogoče zapreti %s."
+
+#~ msgid "greek"
+#~ msgstr "grščina"
+
+#~ msgid "hebrew"
+#~ msgstr "hebrejščina"
+
+#~ msgid "turkish"
+#~ msgstr "turščina"
+
+#~ msgid "thai"
+#~ msgstr "tajska"
+
+#~ msgid "russian"
+#~ msgstr "rusko"
+
+#~ msgid "ukrainian"
+#~ msgstr "ukrajinsko"
+
+#~ msgid "korean"
+#~ msgstr "korejščina"
+
+#~ msgid "Could not launch %s to query the public key %s."
+#~ msgstr "Ni mogoče zagnati %s za poizvedbo javnega ključa %s."
+
+#~ msgid ""
+#~ "Running %s failed with return value %d:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Zaganjanje %s je spodletelo z vrednostjo %d:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Running %s successful:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Zaganjanje %s je bilo uspešno:\n"
+#~ "%s"
+
+#~ msgid ""
+#~ "Could not send the message to %s:\n"
+#~ "%d: %s\n"
+#~ "Message left in your outbox.\n"
+#~ msgstr ""
+#~ "Sporočila ni mogoče poslati na %s:\n"
+#~ "%d: %s\n"
+#~ "Sporočilo je ostalo v odhodnem predalu.\n"
+
+#~ msgid ""
+#~ "Message submission problem, placing it into your outbox.\n"
+#~ "System will attempt to resubmit the message until you delete it."
+#~ msgstr ""
+#~ "Težava z objavo sporočila, postavljanje v odhodni predal.\n"
+#~ "Sistem bo poskušal znova objaviti sporočilo, dokler ga ne izbrišete."
+
+#~ msgid "From: %d <%s>"
+#~ msgstr "Od: %d <%s>"
+
+#~ msgid "From %s: %d %s"
+#~ msgstr "Od %s: %d %s"
+
+#~ msgid "To: %d <%s>"
+#~ msgstr "Za: %d <%s>"
+
+#~ msgid "To %s: %d %s"
+#~ msgstr "Za %s: %d %s"
+
+#~ msgid ""
+#~ "SMTP server refused connection.\n"
+#~ "Check your internet connection."
+#~ msgstr ""
+#~ "Strežnik SMTP je zavrnil povezavo.\n"
+#~ "Preverite medmrežno povezavo."
+
+#~ msgid ""
+#~ "SMTP server cannot be reached.\n"
+#~ "Check your internet connection."
+#~ msgstr ""
+#~ "Strežnik SMTP ni dostopen.\n"
+#~ "Preverite medmrežno povezavo."
+
+#~ msgid "Message left in Outbox (try again later)"
+#~ msgstr "Sporočilo je ostalo v odhodnem predalu (poskusite znova kasneje)"
+
+#~ msgid ""
+#~ "SMTP server problem (%d): %s\n"
+#~ "Message is left in outbox."
+#~ msgstr ""
+#~ "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"
+
+#~ msgid ""
+#~ "Problem Creating Mailboxes\n"
+#~ "%s"
+#~ msgstr ""
+#~ "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"
+
+#~ msgid "_Reply..."
+#~ msgstr "_Odgovori ..."
+
+#~ msgid "_Store Address..."
+#~ msgstr "_Shrani naslov ..."
+
+#~ msgid "_Save..."
+#~ msgstr "_Shrani ..."
+
+#~ msgid "_Copy to folder..."
+#~ msgstr "_Kopiraj v mapo ..."
+
+#~ msgid ""
+#~ "This is an inline %s signed %s message part:\n"
+#~ "%s"
+#~ msgstr ""
+#~ "Medvrstični %s podpisan %s del besedila:\n"
+#~ "%s"
+
+#~ msgid "_Run GnuPG to import this key"
+#~ msgstr "_Zaženi GnuPG za uvoz tega ključa"
+
+#~ msgid "Reply..."
+#~ msgstr "Odgovori ..."
+
+#~ msgid "... [truncated]"
+#~ msgstr "... [skrajšano]"
 
-#: ../src/toolbar-prefs.c:551
-msgid "Down"
-msgstr "Navzdol"
+#~ msgid "Fcc:"
+#~ msgstr "MKp:"
+
+#~ msgid "Save..."
+#~ msgstr "Shrani ..."
+
+#~ msgid "Address"
+#~ msgstr "Naslov"
+
+#~ msgid "S_tore"
+#~ msgstr "S_hrani"
+
+#~ msgid "_Cc:"
+#~ msgstr "_Kp:"
+
+#~ msgid "Balsa Filters"
+#~ msgstr "Balsini filtri"
+
+#~ msgid "Balsa Filters Export"
+#~ msgstr "Izvoz Balsinih filtrov"
+
+#~ msgid "_Up"
+#~ msgstr "_Gor"
+
+#~ msgid "Do_wn"
+#~ msgstr "_Dol"
+
+#~ msgid ""
+#~ "Balsa was built without SSL support.\n"
+#~ "Neither SSL nor TLS can be used."
+#~ msgstr ""
+#~ "Balsa je bila zgrajena brez podpore SSL.\n"
+#~ "Uporabiti ni mogoče niti SSL niti TLS."
+
+#~ msgid "Remote IMAP _folder..."
+#~ msgstr "Oddaljena _mapa IMAP ..."
+
+#~ msgid "Remote IMAP _subfolder..."
+#~ msgstr "Oddaljena po_dmapa IMAP ..."
+
+#~ msgid "_Properties..."
+#~ msgstr "_Lastnosti ..."
+
+#~ msgid "Could not write to %s: %s"
+#~ msgstr "Ni mogoče pisati v %s: %s"
+
+#~ msgid "Attach file at PATH"
+#~ msgstr "Priloži datoteko na POTI"
+
+#~ msgid "Debug POP3 connection"
+#~ msgstr "Razhroščevanje povezave POP3"
+
+#~ msgid "The Balsa E-Mail Client"
+#~ msgstr "Balsa odjemalec elektronske pošte"
+
+#~ msgid ""
+#~ "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č"
+
+#~ msgid "_Headers"
+#~ msgstr "_Glave"
+
+#~ 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"
+
+#~ msgid "_Address Book..."
+#~ msgstr "_Imenik ..."
+
+#~ msgid "Open the address book"
+#~ msgstr "Odpre imenik"
+
+#~ msgid "Quit Balsa"
+#~ msgstr "Konča program"
+
+#~ msgid "_Message..."
+#~ msgstr "_Sporočilo ..."
+
+#~ msgid "Compose a new message"
+#~ msgstr "Sestavi novo sporočilo"
+
+#~ msgid "Local mbox mailbox..."
+#~ msgstr "Krajevni poštni predal mbox ..."
+
+#~ msgid "Add a new mbox style mailbox"
+#~ msgstr "Dodaj nov poštni predal v slogu mbox"
+
+#~ msgid "Local Maildir mailbox..."
+#~ msgstr "Krajevni poštni predal Maildir ..."
+
+#~ msgid "Add a new Maildir style mailbox"
+#~ msgstr "Dodaj nov poštni predal oblike v slogu maildir"
+
+#~ msgid "Local MH mailbox..."
+#~ msgstr "Krajevni poštni predal MH ..."
+
+#~ msgid "Add a new MH style mailbox"
+#~ msgstr "Doda nov poštni predal v slogu MH"
+
+#~ msgid "New mailbox..."
+#~ msgstr "Nov poštni predal ..."
+
+#~ msgid "New \"Maildir\" mailbox..."
+#~ msgstr "Nov poštni predal \"Maildir\" ..."
+
+#~ msgid "New \"MH\" mailbox..."
+#~ msgstr "Nov poštni predal \"MH\" ..."
+
+#~ msgid "Add a new IMAP mailbox"
+#~ msgstr "Doda nov poštni predal IMAP"
+
+#~ msgid "Remote IMAP folder..."
+#~ msgstr "Oddaljena mapa IMAP ..."
+
+#~ msgid "Add a new IMAP folder"
+#~ msgstr "Doda novo mapo IMAP"
+
+#~ msgid "Remote IMAP subfolder..."
+#~ msgstr "Oddaljena podmapa IMAP ..."
+
+#~ msgid "Add a new IMAP subfolder"
+#~ msgstr "Doda novo podmapo IMAP"
+
+#~ msgid "F_ilters..."
+#~ msgstr "_Filtri ..."
+
+#~ 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"
+
+#~ msgid "Increase magnification"
+#~ msgstr "Povečaj povečavo"
+
+#~ msgid "Decrease magnification"
+#~ msgstr "Zmanjšaj povečavo"
+
+#~ 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"
+
+#~ msgid "_Toolbars..."
+#~ msgstr "_Orodne vrstice ..."
+
+#~ 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"
+
+#~ msgid "_Select All"
+#~ msgstr "_Izberi vse"
+
+#~ msgid "Select all messages in current mailbox"
+#~ msgstr "Izbere vsa sporočila v trenutnem poštnem predalu"
+
+#~ msgid "_Delete..."
+#~ msgstr "_Izbriši ..."
+
+#~ 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"
+
+#~ msgid "Reply to _All..."
+#~ msgstr "Odgovori _vsem ..."
+
+#~ msgid "Reply to all recipients of the current message"
+#~ msgstr "Odgovori vsem prejemnikom trenutnega sporočila"
+
+#~ msgid "Reply to _Group..."
+#~ msgstr "Odgovori _skupini ..."
+
+#~ msgid "Reply to mailing list"
+#~ msgstr "Odgovori na poštni seznam"
+
+#~ msgid "Store address of sender in addressbook"
+#~ msgstr "Shrani naslov pošiljatelja v imenik"
+
+#~ msgid "_View Source..."
+#~ msgstr "_Ogled izvora ..."
+
+#~ msgid "View source form of the message"
+#~ msgstr "Pogled izvorno obliko sporočila"
+
+#~ msgid "_Forward..."
+#~ msgstr "_Posreduj ..."
+
+#~ msgid "Forward the current message"
+#~ msgstr "Posreduje trenutno sporočilo"
+
+#~ msgid "_Forward attached..."
+#~ msgstr "_Posreduj priloženo ..."
+
+#~ msgid "Forward the current message as attachment"
+#~ msgstr "Posreduje trenutno sporočilo kot prilogo"
+
+#~ msgid "Forward _inline..."
+#~ msgstr "Posreduj _medvrstično ..."
+
+#~ msgid "Forward the current message inline"
+#~ msgstr "Posreduje trenutno sporočilo medvrstično"
+
+#~ 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"
+
+#~ msgid "_Print..."
+#~ msgstr "_Natisni ..."
+
+#~ 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"
+
+#~ msgid "_Delete to Trash"
+#~ msgstr "_Premakni v smeti"
+
+#~ 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"
+
+#~ msgid "Sort in a descending order"
+#~ msgstr "Razvrsti padajoče"
+
+#~ msgid "_View filter"
+#~ msgstr "Filter _pogleda"
+
+#~ 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"
+
+#~ msgid "_Flat index"
+#~ msgstr "_Plosko kazalo"
+
+#~ msgid "No threading at all"
+#~ msgstr "Brez nitenja"
+
+#~ msgid "Si_mple threading"
+#~ msgstr "_Enostavno nitenje"
+
+#~ msgid "Simple threading algorithm"
+#~ msgstr "Enostavni algoritem nitenja"
+
+#~ msgid "_JWZ threading"
+#~ msgstr "_JWZ nitenje"
+
+#~ msgid "Elaborate JWZ threading"
+#~ msgstr "Podrobno nitenje JWZ"
+
+#~ msgid "By _Arrival"
+#~ msgstr "Po _prihodu"
+
+#~ msgid "Arrival order"
+#~ msgstr "Razvrstitev po prihodu"
+
+#~ msgid "By _Sender"
+#~ msgstr "Po _pošiljatelju"
+
+#~ msgid "Sender order"
+#~ msgstr "Razvrstitev po pošiljateljih"
+
+#~ msgid "By S_ubject"
+#~ msgstr "Po _zadevi"
+
+#~ msgid "Subject order"
+#~ msgstr "Razvrstitev po zadevi"
+
+#~ msgid "By Si_ze"
+#~ msgstr "Po _velikosti"
+
+#~ msgid "By message size"
+#~ msgstr "Po velikosti sporočila"
+
+#~ msgid "_Threaded"
+#~ msgstr "_Niten seznam"
+
+#~ msgid "Use message threading"
+#~ msgstr "Uporabi nitenje sporočil"
+
+#~ msgid "Balsa: you have received %d new message."
+#~ msgid_plural "Balsa: you have received %d new messages."
+#~ msgstr[0] "Balsa: prejeli ste %d novih sporočil."
+#~ msgstr[1] "Balsa: prejeli ste %d novo sporočilo."
+#~ msgstr[2] "Balsa: prejeli ste %d novi sporočili."
+#~ msgstr[3] "Balsa: prejeli ste %d nova sporočila."
+
+#~ msgid "Balsa: you have new mail."
+#~ msgstr "Balsa: imate novo pošto."
+
+#~ msgid "Close the message window"
+#~ msgstr "Zapei okno sporočila"
+
+#~ msgid "_Find in message"
+#~ msgstr "_Najdi v sporočilu"
+
+#~ msgid "Move the message to Trash mailbox"
+#~ msgstr "Premakne sporočilo v poštni predal smeti"
+
+#~ msgid "Show toolbar"
+#~ msgstr "Pokaži orodno vrstico"
+
+#~ msgid "_Selected Headers"
+#~ msgstr "_Izbrane glave"
+
+#~ msgid "Fast"
+#~ msgstr "Hitro"
+
+#~ msgid "Normal"
+#~ msgstr "Običajno"
+
+#~ msgid "Bad spellers"
+#~ msgstr "Slabi črkovalniki"
+
+#~ msgid "Mail servers"
+#~ msgstr "Poštni strežniki"
+
+#~ msgid "Layout"
+#~ msgstr "Razporeditev"
+
+#~ msgid "Show mailbox statistics in left pane"
+#~ msgstr "Pokaži statistiko poštnega predala v levem pladnju"
+
+#~ msgid "Composition window"
+#~ msgstr "Sestavljalno okno"
+
+#~ msgid "Invalid or incomplete address label color"
+#~ msgstr "Neveljavna ali nepopolna barva oznake naslova"
+
+#~ msgid "Pspell settings"
+#~ msgstr "Nastavitve pspell"
+
+#~ msgid "Spell check module"
+#~ msgstr "Modul preverjanja črkovanja"
+
+#~ msgid "Suggestion level"
+#~ msgstr "Raven predlogov"
+
+#~ msgid "Ignore words shorter than"
+#~ msgstr "Prezri besede krajše od"
+
+#~ msgid "Error displaying link_id %s: %s\n"
+#~ msgstr "Napaka med prikazom link_id %s: %s\n"
+
+#~ msgid "Error opening GConf database\n"
+#~ msgstr "Napaka med odpiranjem podatkovne zbirke GConf\n"
+
+#~ 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"
+
+#~ msgid "Save this message"
+#~ msgstr "Shrani to sporočilo"
+
+#~ msgid "Print the edited message"
+#~ msgstr "Natisne urejeno sporočilo"
+
+#~ msgid "_Undo"
+#~ msgstr "_Razveljavi"
+
+#~ msgid "Undo most recent change"
+#~ msgstr "Razveljavi zadnjo spremembo"
+
+#~ msgid "_Redo"
+#~ msgstr "_Uveljavi"
+
+#~ 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"
+
+#~ msgid "Select _Identity..."
+#~ msgstr "Izberi _istovetnost ..."
+
+#~ 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"
+
+#~ msgid "Sen_d"
+#~ msgstr "_Pošlji"
+
+#~ msgid "Send this message"
+#~ msgstr "Pošlji sporočilo"
+
+#~ msgid "_Queue"
+#~ msgstr "Postavi v _vrsto"
+
+#~ msgid "Queue this message in Outbox for sending"
+#~ msgstr "Postavi sporočilo v vrsto za pošiljanje v odhodni predal"
+
+#~ msgid "_Postpone"
+#~ msgstr "_Odloži"
+
+#~ msgid "Send _Later"
+#~ msgstr "Pošlji _kasneje"
+
+#~ msgid "Sa_ve and Close"
+#~ msgstr "S_hrani in zapri"
+
+#~ 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"
+
+#~ msgid "signs the message using GnuPG"
+#~ msgstr "podpiše sporočilo z GnuPG"
+
+#~ 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 ..."
+
+#~ msgid "F_cc:"
+#~ msgstr "M_Kp:"
+
+#~ msgid "Could not open the file %s.\n"
+#~ msgstr "Datoteke %s ni mogoče odpreti.\n"
+
+#~ msgid "Could not compile %s"
+#~ msgstr "Ni mogoče prevesti %s"
+
+#~ msgid "Quoted Text Regular Expression"
+#~ msgstr "Logični izraz navedenega besedila"
+
+#~ msgid "BalsaSpellCheck: Quoted text regular expression compilation failed\n"
+#~ msgstr ""
+#~ "Preverjanje črkovanja: prevajanje logičnega izraza navedenega besedila je "
+#~ "spodletelo\n"
+
+#~ msgid ""
+#~ "BalsaSpellCheck: Learn operation failed;\n"
+#~ "%s\n"
+#~ msgstr ""
+#~ "Preverjanje črkovanja: opravilo učenja je spodletelo;\n"
+#~ "%s\n"
+
+#~ msgid "BalsaSpellCheck: Learn operation failed.\n"
+#~ msgstr "Preverjanje črkovanja: opravilo učenja je spodletelo.\n"
+
+#~ msgid "BalsaSpellCheck: Suggest %s (%s)\n"
+#~ msgstr "Preverjanje črkovanja: predlog %s (%s)\n"
+
+#~ msgid "Save this address and close the dialog?"
+#~ msgstr "Ali naj bo ta naslov shranjen in pogovorno okno zaprto?"
+
+#~ msgid "Choose Address Book"
+#~ msgstr "Izbor imenika"
+
+#~ msgid "Choose Address"
+#~ msgstr "Izbor naslova"
+
+#~ msgid "_Customize Toolbars..."
+#~ msgstr "_Prilagodi orodne vrstice ..."
+
+#~ msgid "Up"
+#~ msgstr "Navzgor"
+
+#~ msgid "Down"
+#~ msgstr "Navzdol"
+
+#~ msgid "the crypto engine for protocol OpenPGP is not available"
+#~ msgstr "Å¡ifrirni programnik za protokol OpenPGP ni na voljo"
+
+#~ msgid "the crypto engine for protocol CMS is not available"
+#~ msgstr "Å¡ifrirni programnik za protokol CMS ni na voljo"
+
+#~ msgid "invalid crypto engine %d"
+#~ msgstr "neveljaven Å¡ifrirni programnik %d"
+
+#~ msgid "Gpgme has been compiled without support for protocol %s."
+#~ msgstr "Gpgme je bil preveden brez podpore za protokol %s."
+
+#~ msgid "Crypto engine %s is not installed properly."
+#~ msgstr "Šifrirni programnik %s ni pravilno nameščen."
+
+#~ msgid " Hint: check the `gnupg2' (preferred) or `gnupg' package."
+#~ msgstr " Namig: preverite paket `gpgsm' (prednostno) ali `gnupg'."
+
+#~ msgid " Hint: check the `gpgsm' package."
+#~ msgstr " Namig: preverite paket `gpgsm'."
+
+#~ msgid ""
+#~ "Crypto engine %s version %s is installed, but at least version %s is "
+#~ "required."
+#~ msgstr ""
+#~ "Šifrirni programnik %s, različice %s. je nameščen, toda za delovanje mora "
+#~ "biti naložena vsaj različica %s."
+
+#~ msgid "Unknown problem with engine for protocol %s."
+#~ msgstr "Neznana težava s programnikom za protokol %s."
+
+#~ msgid "%s: could not retrieve crypto engine information: %s."
+#~ msgstr "%s: ni mogoče pridobiti podrobnosti šifrirnega programnika: %s."
+
+#~ msgid "Enter passphrase to unlock the secret key for signing"
+#~ msgstr ""
+#~ "Vnesite šifrirno frazo za odklepanje skritega ključa za podpisovanje"
+
+#~ msgid "creating a gpgme context failed"
+#~ msgstr "ustvarjanje vsebine gpgme je spodletelo"
+
+#~ msgid "Enter passphrase to decrypt message"
+#~ msgstr "Vnesite geslo za dešifriranje sporočila"
+
+#~ msgid ""
+#~ "\n"
+#~ "Signed by: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Podpisnik: %s"
+
+#~ msgid ""
+#~ "\n"
+#~ "Mail address: %s"
+#~ msgstr ""
+#~ "\n"
+#~ "Poštni naslov: %s"
+
+#~ msgid "Uploading %"
+#~ msgstr "Pošiljanje %s"
 
 #~ msgid "Local Mailbox Configurator"
 #~ msgstr "Nastavitve krajevnega poštnega predala"
-