added 'Empty junk' context menu to Junk folder.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2640 ee746299-78ed-0310-b773-934348b2243d

1 files changed, 397 insertions, 363 deletions

diff --git a/po/sr.po b/po/sr.po
index da2279c2..2703b8ac 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -327,7 +327,7 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu napraviti direktorijum."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -509,12 +509,12 @@ msgstr "Pronađeno %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je spremljena.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Direktorijum"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Direktorijum"
@@ -660,7 +660,7 @@ msgstr ""
 "niste, pišite ne Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, SAD."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -698,7 +698,7 @@ msgstr ""
 "Nove poruke biti će proveravane ovim redom. Označite pod\n"
 "`G' one naloge sa kojih želite skinuti e-poštu sa `Primi sve'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -839,8 +839,8 @@ msgstr "Dodaj adresu u adresar"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Beleške"
 
@@ -848,34 +848,34 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Zabeležena pravila"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -883,196 +883,196 @@ msgstr "/_Datoteka/Novi _server"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Izmeni"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _direktorijum"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Izmeni"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiranje..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Direktorijum"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Pretraga"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Pretraga"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "Zatvori"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Zaista obrisati adresu/e?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1082,38 +1082,38 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo direktorijum"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Direktorijum i adrese"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Zaista obrisati `%s' ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu sačuvati index datoteku."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu sačuvati datoteke adresara."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspešno prebačen."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1121,7 +1121,7 @@ msgstr ""
 "Stari adresar ne može biti prebačen,\n"
 "ne mogu sačuvati novu index datoteku adresara."
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1129,7 +1129,7 @@ msgstr ""
 "Ne mogu prebaciti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1137,7 +1137,7 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1145,17 +1145,17 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Prebacivanje adresara"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1163,73 +1163,73 @@ msgid ""
 "%s%c%s"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr "Stari adresar unešen, ne mogu napraviti index datoteke novih adresa"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Ne mogu uneti adresar, pravim prazne datoteke novog adresara."
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Ne mogu uneti adresar, ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Ne mogu uneti adresar i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Izgled programa"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1241,11 +1241,11 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Obaveštenje"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Upozorenje"
 
@@ -1292,7 +1292,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Ništa"
 
@@ -1308,8 +1308,8 @@ msgstr "/_Dodaj..."
 msgid "/_Remove"
 msgstr "/_Skloni"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
@@ -1390,7 +1390,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Izmeni/_Kopiraj"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Pregled"
 
@@ -1674,7 +1674,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1718,7 +1718,7 @@ msgstr "Automatski postavi sledeće adrese"
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tema:"
 
@@ -1866,7 +1866,7 @@ msgstr "MIME tip"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Veličina"
 
@@ -1999,28 +1999,28 @@ msgstr "Ime i iznos moraju biti navedeni."
 msgid "Edit Person Data"
 msgstr "Izmeni lične podatke"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Prikaz imena"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Prezime"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Ime"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Nadimak"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Adresa e-pošte"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2134,12 +2134,12 @@ msgstr "Izmeni direktorijum"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -2156,7 +2156,7 @@ msgid "Edit JPilot Entry"
 msgstr "Izmenite JPilot unos"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2349,201 +2349,207 @@ msgstr ""
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Poslato"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr ""
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uvršten u ime direktorijuma."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi direktorijum..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj direktorijum..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/P_reimenuj direktorijum..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Obriši direktorijum"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "Isprazni smeće"
+
+#: src/folderview.c:260 src/folderview.c:284
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Proveri ima li novih poruka"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/Osv_eži stablo direktorijuma"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Pregled/_Osveži rezime"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "/_Označi/Označi kao _pročitano"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Šalje odložene poruku/e"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Traži poruke..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepročitanih poruka."
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prijavi se na _news grupu..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Skloni news _grupu"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Stvaram pregled za direktorijum...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Postavljam info direktorijuma...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "/O_sveži stablo direktorijuma"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr ""
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2553,26 +2559,26 @@ msgstr ""
 "(ukoliko želite napraviti direktorijum za smeštanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2581,12 +2587,12 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši direktorijum"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2597,21 +2603,31 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Tema"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Isprazniti sve poruke iz smeća?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2620,34 +2636,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
@@ -2660,7 +2676,7 @@ msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Bez pošiljaoca)"
 
@@ -2740,120 +2756,120 @@ msgstr "Odaberite datoteku za uvoz"
 msgid "Select importing file"
 msgstr "Odaberite datoteku za uvoz"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Odredite ime adresara i datoteku za uvoz."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "Označite i promenite ime LDIF polja za izvoz."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Datoteka uvežena."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Odaberite datoteku."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Ime adresara mora biti navedeno."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "Greška pri čitanju LDIF polja."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "LDIF datoteka je uspežno uvežena."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "Odaberite vCard datoteku"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Ime datoteke"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "LDIF polje"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Adresar :"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Gore"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Dole"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Adresar :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Ime datoteke :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Beleške :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "Unesi LDIF datoteku u Adresar"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Sled."
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Preth."
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Info datoteke"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "LDIF polje"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Gotovo"
 
@@ -3033,7 +3049,7 @@ msgstr "Izlazim"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3122,16 +3138,16 @@ msgstr "Unesite lozinku"
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvara prozor za pisanje"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3141,73 +3157,73 @@ msgstr ""
 "                         otvara prozor za pisanje sa navedenim datotekama\n"
 "                         dodato"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prima nove poruke"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          primi sve poruke sa svih naloga"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 šalje sve odložene poruke"
 
-#: src/main.c:582
+#: src/main.c:585
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:583
+#: src/main.c:586
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                debug način"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug način"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikaž ovu pomoć izađi"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikazuje verziju i izlazi"
 
-#: src/main.c:597
+#: src/main.c:600
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ili pritisnite `y´ tipku.\n"
 "\n"
 
-#: src/main.c:728
+#: src/main.c:731
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izlazni charset"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3221,19 +3237,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Napisana poruka postoji. Zaista prekinuti?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Odložene poruke"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlate poruke su odložene. Izaći odmah?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3241,21 +3257,21 @@ msgstr ""
 "GnuPG nije pravilno instaliran ili je verzija suviše stara.\n"
 "OpenPGP podrška je onemogućena."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pisanje konfiguracije za akcije...\n"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3625,15 +3641,15 @@ msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Iz_vor poruke"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
@@ -3951,8 +3967,8 @@ msgstr "Kreiranje glavnih prozora...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -4023,7 +4039,7 @@ msgstr "Sylpheed - Direktorijumi"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/Od_govor"
 
@@ -4042,15 +4058,15 @@ msgstr "/O_dgovori/_pošiljaocu"
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
@@ -4097,22 +4113,22 @@ msgstr "Izlaz iz ovog programa?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Odaberite direktorijum"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "Linija za neredbe nije podešena."
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4129,7 +4145,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4146,15 +4162,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4211,7 +4227,7 @@ msgstr "Dodatak"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
@@ -4233,7 +4249,7 @@ msgstr "/S_ačuvaj kao"
 msgid "/Save _all..."
 msgstr "/S_ačuvaj kao"
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Štampanje..."
 
@@ -4646,7 +4662,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Naredba"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi sledeće adrese"
 
@@ -4900,7 +4916,7 @@ msgstr "Sintaksna pomoć"
 msgid "Registered actions"
 msgstr "Registrovane akcije"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Novo)"
 
@@ -6331,28 +6347,28 @@ msgstr "Tip"
 msgid "Normal"
 msgstr "Normalno"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Nalog"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Primeni na poddirektorijume"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "koristi i prilikom odovora"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Odvovori-Na:"
 
@@ -6391,19 +6407,19 @@ msgstr "Dodatak"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Datum"
 
@@ -6413,7 +6429,7 @@ msgid "Number"
 msgstr "Broj"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Za:"
@@ -6435,43 +6451,61 @@ msgstr ""
 "Odaberite pojedinosti za prikaz. Možete menjati poredak\n"
 "koristeći Gore / Dolje tipke, ili povlačenjem miša."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Ime šablona"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Unesi"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Zameni "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Simboli "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Registrovani šabloni"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Šabloni"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Ime šablona"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Ime šablona"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Šablon"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Greška formata šablona."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Briši šablon"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Zaista želite obrisati ovaj šablon?"
 
@@ -6720,7 +6754,7 @@ msgstr "Filtriranje..."
 msgid "Searching %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6829,7 +6863,7 @@ msgstr "O"
 msgid "%s - POP3 Remote mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Ne."
 
@@ -7396,7 +7430,7 @@ msgstr "Ne mogu pronaći listu news grupa."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne mogu pronaći listu news grupa."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Gotovo."
 
@@ -7405,353 +7439,353 @@ msgstr "Gotovo."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d news grupa primljeno (%s pročitano)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/O_dgovori"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/O_dgovori/svim_a"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Premeštanje..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Kopiranje..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Označi"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Označi/_Označi"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Označi/_Ukloni oznaku"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Označi/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Označi/Označi kao _nepročitano"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Označi/Označi kao _pročitano"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Označi/Označi kao _pročitano"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Označi/Označi sve _pročitano"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Oznaka _boje"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Ponovi i_zmeni"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Dod_aj pošiljaoca u adresar"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Napravi pravilo za f_iter"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Napravi pravilo za f_iter/_Automatski"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Napravi pravilo za f_iter/Po _Od"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Napravi pravilo za f_iter/Po _Za"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Napravi pravilo za f_iter/Po _Temi"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Stvaranje pregleda održavanja...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Pregledanje direktorijuma (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Izvrši oznaku"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Pregledanje direktorijuma (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Ne mogu se povezati s IMAP4 serverom: %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 #, fuzzy
 msgid "_Search again"
 msgstr "Pretraži ponovo"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Nema više nepročitanih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Nema više novih poruka"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Nema više novih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Nema novih poruka."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nema više novih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Nema više obeleženih poruka"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema više obeleženih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Nema obeleženih poruka."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema više obeleženih poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Prihvatanje poruka po temi..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premešteno"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Postavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li zaista obrisati poruku/e iz smeća?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Brianje duplih poruka..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premeštanje u %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Odredište je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Odaberite direktorijum"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "ODredište za kopiranje je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Odaberite direktorijum"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Izgrađivanje stabla..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"