modified several alerts, and added accelerators for the buttons.

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

1 files changed, 190 insertions, 175 deletions

diff --git a/po/sl.po b/po/sl.po
index 283df7c6..d88c4c92 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-07-08 19:05+0900\n"
+"POT-Creation-Date: 2005-07-12 15:22+0900\n"
 "PO-Revision-Date: 2003-01-24 20:39CET\n"
 "Last-Translator: Jernej Kovacic <jkovacic@email.si>\n"
 "Language-Team: Slovenian <translator-team-sl@lists.sourceforge.net>\n"
@@ -97,7 +97,7 @@ msgstr ""
 "v stolpcu `G', da omogočite pobiranje sporočil z ukazom `Poberi vsa'."
 
 #: src/account.c:691 src/addressadd.c:192 src/addressbook.c:490
-#: src/compose.c:4025 src/editaddress.c:200 src/editaddress.c:942
+#: src/compose.c:4073 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
 #: src/mimeview.c:201 src/prefs_filter.c:258 src/prefs_folder_item.c:170
@@ -117,21 +117,22 @@ msgstr "Strežnik"
 msgid "Edit"
 msgstr "Urejanje"
 
-#: src/account.c:758
-msgid " Set as default account "
+#: src/account.c:759
+#, fuzzy
+msgid " _Set as default account "
 msgstr " Nastavi kot privzet račun "
 
-#: src/account.c:811
+#: src/account.c:812
 #, fuzzy, c-format
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Ali resnično želite izbrisati ta račun?"
 
-#: src/account.c:813 src/prefs_filter.c:763
+#: src/account.c:814 src/prefs_filter.c:763
 #, fuzzy
 msgid "(Untitled)"
 msgstr "Brez naslova"
 
-#: src/account.c:814
+#: src/account.c:815
 msgid "Delete account"
 msgstr "Brisanje računa"
 
@@ -232,7 +233,7 @@ msgstr ""
 msgid "Add Address to Book"
 msgstr "Dodaj naslov v adresar"
 
-#: src/addressadd.c:202 src/compose.c:4473 src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4520 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Naslov"
@@ -246,7 +247,7 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressbook.c:336 src/compose.c:491 src/mainwindow.c:470
+#: src/addressbook.c:336 src/compose.c:492 src/mainwindow.c:470
 #: src/messageview.c:137
 msgid "/_File"
 msgstr "/_Datoteka"
@@ -267,8 +268,8 @@ msgstr "/_Datoteka/Nov _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:496
-#: src/compose.c:501 src/compose.c:505 src/mainwindow.c:488
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:497
+#: src/compose.c:502 src/compose.c:506 src/mainwindow.c:488
 #: src/mainwindow.c:491 src/mainwindow.c:493 src/mainwindow.c:496
 #: src/mainwindow.c:498 src/messageview.c:140
 msgid "/_File/---"
@@ -286,7 +287,7 @@ msgstr "/_Datoteka/_Brisanje"
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:350 src/compose.c:506 src/messageview.c:141
+#: src/addressbook.c:350 src/compose.c:507 src/messageview.c:141
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
@@ -318,7 +319,7 @@ msgstr "/_Naslov/_Urejanje"
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:358 src/compose.c:615 src/mainwindow.c:725
+#: src/addressbook.c:358 src/compose.c:616 src/mainwindow.c:725
 #: src/messageview.c:256
 msgid "/_Tools"
 msgstr "/_Orodja"
@@ -327,12 +328,12 @@ msgstr "/_Orodja"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:360 src/compose.c:628 src/mainwindow.c:775
+#: src/addressbook.c:360 src/compose.c:629 src/mainwindow.c:775
 #: src/messageview.c:274
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:361 src/compose.c:629 src/mainwindow.c:786
+#: src/addressbook.c:361 src/compose.c:630 src/mainwindow.c:786
 #: src/messageview.c:275
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
@@ -349,7 +350,7 @@ msgstr "/Nova _skupina"
 msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
-#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:485
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:486
 #: src/folderview.c:235 src/folderview.c:237 src/folderview.c:241
 #: src/folderview.c:252 src/folderview.c:254 src/folderview.c:256
 #: src/folderview.c:260 src/folderview.c:270 src/folderview.c:272
@@ -359,7 +360,7 @@ msgstr "/Nova _mapa"
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:508
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:509
 #: src/mainwindow.c:502 src/messageview.c:143
 msgid "/_Edit"
 msgstr "/_Urejanje"
@@ -372,7 +373,7 @@ msgstr "/_Brisanje"
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:495 src/compose.c:4474 src/prefs_common.c:2399
+#: src/addressbook.c:495 src/compose.c:4521 src/prefs_common.c:2399
 msgid "Address book"
 msgstr "Imenik naslovov"
 
@@ -381,10 +382,10 @@ msgid "Name:"
 msgstr "Ime:"
 
 #. Buttons
-#: src/addressbook.c:627 src/addressbook.c:1667 src/addressbook.c:1673
-#: src/editaddress.c:884 src/editaddress.c:1017 src/mainwindow.c:2292
-#: src/prefs_actions.c:266 src/prefs_display_header.c:278
-#: src/prefs_display_header.c:333 src/prefs_template.c:231
+#: src/addressbook.c:627 src/addressbook.c:1673 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2292 src/prefs_actions.c:266
+#: src/prefs_display_header.c:278 src/prefs_display_header.c:333
+#: src/prefs_template.c:231
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -422,20 +423,26 @@ msgid "Really delete the address(es)?"
 msgstr "Res želite izbrisati naslov(e)?"
 
 #: src/addressbook.c:1664
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"Do you want to delete the folder AND all addresses in `%s' ? \n"
+"Do you want to delete the folder AND all addresses in `%s' ?\n"
 "If deleting the folder only, addresses will be moved into parent folder."
 msgstr ""
 "Ali res želite izbrisati mapo IN vse naslove v '%s' ? \n"
 "Če izbrišete samo mapo, se bodo vsi naslovi prestavili v starševsko mapo."
 
+#: src/addressbook.c:1667 src/folderview.c:2125
+msgid "Delete folder"
+msgstr "Izbriši mapo"
+
 #: src/addressbook.c:1667
-msgid "Folder only"
+#, fuzzy
+msgid "_Folder only"
 msgstr "Samo mapa"
 
 #: src/addressbook.c:1667
-msgid "Folder and Addresses"
+#, fuzzy
+msgid "Folder and _addresses"
 msgstr "Mapa in naslovi"
 
 #: src/addressbook.c:1672
@@ -582,11 +589,11 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:138 src/compose.c:5155 src/main.c:483
+#: src/alertpanel.c:138 src/compose.c:5203 src/main.c:483
 msgid "Notice"
 msgstr "Opomba"
 
-#: src/alertpanel.c:151 src/main.c:280 src/textview.c:2071
+#: src/alertpanel.c:151 src/main.c:280
 msgid "Warning"
 msgstr "Opozorilo"
 
@@ -637,382 +644,382 @@ msgstr "Rjava"
 msgid "None"
 msgstr "Nič"
 
-#: src/compose.c:483
+#: src/compose.c:484
 msgid "/_Add..."
 msgstr "/_Dodaj"
 
-#: src/compose.c:484
+#: src/compose.c:485
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:486 src/folderview.c:243 src/folderview.c:262
+#: src/compose.c:487 src/folderview.c:243 src/folderview.c:262
 #: src/folderview.c:277
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
 
-#: src/compose.c:492
+#: src/compose.c:493
 #, fuzzy
 msgid "/_File/_Send"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/compose.c:494
+#: src/compose.c:495
 #, fuzzy
 msgid "/_File/Send _later"
 msgstr "/_Sporočilo/Poš_lji pozneje"
 
-#: src/compose.c:497
+#: src/compose.c:498
 #, fuzzy
 msgid "/_File/Save to _draft folder"
 msgstr "/_Sporočilo/Shrani v mapo _draft"
 
-#: src/compose.c:499
+#: src/compose.c:500
 #, fuzzy
 msgid "/_File/Save and _keep editing"
 msgstr "/_Sporočilo/Poš_lji in nadaljuj z urejanjem"
 
-#: src/compose.c:502
+#: src/compose.c:503
 msgid "/_File/_Attach file"
 msgstr "/_Datoteka/Pripni d_atoteko"
 
-#: src/compose.c:503
+#: src/compose.c:504
 msgid "/_File/_Insert file"
 msgstr "/Datoteka/Vr_ini datoteko"
 
-#: src/compose.c:504
+#: src/compose.c:505
 msgid "/_File/Insert si_gnature"
 msgstr "/Datoteka/Vrini _podpis"
 
-#: src/compose.c:509
+#: src/compose.c:510
 msgid "/_Edit/_Undo"
 msgstr "/_Uredi/_Razveljavi"
 
-#: src/compose.c:510
+#: src/compose.c:511
 msgid "/_Edit/_Redo"
 msgstr "/_Uredi/_Obnovi"
 
-#: src/compose.c:511 src/compose.c:518 src/mainwindow.c:506
+#: src/compose.c:512 src/compose.c:519 src/mainwindow.c:506
 #: src/messageview.c:146
 msgid "/_Edit/---"
 msgstr "/_Uredi/---"
 
-#: src/compose.c:512
+#: src/compose.c:513
 msgid "/_Edit/Cu_t"
 msgstr "/_Uredi/I_zreži"
 
-#: src/compose.c:513 src/mainwindow.c:503 src/messageview.c:144
+#: src/compose.c:514 src/mainwindow.c:503 src/messageview.c:144
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:514
+#: src/compose.c:515
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/compose.c:515
+#: src/compose.c:516
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Uredi/Prilepi kot _citat"
 
-#: src/compose.c:517 src/mainwindow.c:504 src/messageview.c:145
+#: src/compose.c:518 src/mainwindow.c:504 src/messageview.c:145
 msgid "/_Edit/Select _all"
 msgstr "/_Uredi/Izberi _vse"
 
-#: src/compose.c:519
+#: src/compose.c:520
 msgid "/_Edit/_Wrap current paragraph"
 msgstr "/_Uredi/Prelomi trenutni odstavek"
 
-#: src/compose.c:521
+#: src/compose.c:522
 msgid "/_Edit/Wrap all long _lines"
 msgstr "/_Uredi/_Prelomi vse _dolge vrstice"
 
-#: src/compose.c:523
+#: src/compose.c:524
 #, fuzzy
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/compose.c:524 src/mainwindow.c:511 src/messageview.c:150
+#: src/compose.c:525 src/mainwindow.c:511 src/messageview.c:150
 #: src/summaryview.c:400
 msgid "/_View"
 msgstr "/_Pogled"
 
-#: src/compose.c:525
+#: src/compose.c:526
 msgid "/_View/_To"
 msgstr "/_Ogled/_Komu"
 
-#: src/compose.c:526
+#: src/compose.c:527
 msgid "/_View/_Cc"
 msgstr "/_Ogled/K_p"
 
-#: src/compose.c:527
+#: src/compose.c:528
 msgid "/_View/_Bcc"
 msgstr "/_Ogled/_SKp"
 
-#: src/compose.c:528
+#: src/compose.c:529
 msgid "/_View/_Reply to"
 msgstr "/_Ogled/_Odgovor za"
 
-#: src/compose.c:529 src/compose.c:531 src/compose.c:533 src/compose.c:535
+#: src/compose.c:530 src/compose.c:532 src/compose.c:534 src/compose.c:536
 #: src/mainwindow.c:529 src/mainwindow.c:532 src/mainwindow.c:558
 #: src/mainwindow.c:582 src/mainwindow.c:675 src/mainwindow.c:679
 #: src/messageview.c:233
 msgid "/_View/---"
 msgstr "/_Pogled/---"
 
-#: src/compose.c:530
+#: src/compose.c:531
 msgid "/_View/_Followup to"
 msgstr "/_Pogled/_Sledi do"
 
-#: src/compose.c:532
+#: src/compose.c:533
 msgid "/_View/R_uler"
 msgstr "/_Pogled/R_avnilo"
 
-#: src/compose.c:534
+#: src/compose.c:535
 msgid "/_View/_Attachment"
 msgstr "/_Pogled/_Priloga"
 
-#: src/compose.c:541 src/mainwindow.c:589 src/messageview.c:157
+#: src/compose.c:542 src/mainwindow.c:589 src/messageview.c:157
 #, fuzzy
 msgid "/_View/Character _encoding"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:542
+#: src/compose.c:543
 msgid "/_View/Character _encoding/_Automatic"
 msgstr ""
 
-#: src/compose.c:544 src/compose.c:550 src/compose.c:556 src/compose.c:560
-#: src/compose.c:566 src/compose.c:570 src/compose.c:576 src/compose.c:580
-#: src/compose.c:590 src/compose.c:594 src/compose.c:604 src/compose.c:608
+#: src/compose.c:545 src/compose.c:551 src/compose.c:557 src/compose.c:561
+#: src/compose.c:567 src/compose.c:571 src/compose.c:577 src/compose.c:581
+#: src/compose.c:591 src/compose.c:595 src/compose.c:605 src/compose.c:609
 #: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:153
 #, fuzzy
 msgid "/_View/Character _encoding/---"
 msgstr "/_Pogled/_Razvrščanje/Pa_dajoče"
 
-#: src/compose.c:546 src/mainwindow.c:593 src/messageview.c:161
+#: src/compose.c:547 src/mainwindow.c:593 src/messageview.c:161
 #, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/_Pogled/Nabor zna_kov/7 bitni ASCII (US-ASC_II)"
 
-#: src/compose.c:548 src/mainwindow.c:595 src/messageview.c:164
+#: src/compose.c:549 src/mainwindow.c:595 src/messageview.c:164
 #, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/Videz/Nabor zna_kov/Unicode (_UTF-8)"
 
-#: src/compose.c:552 src/mainwindow.c:599 src/messageview.c:167
+#: src/compose.c:553 src/mainwindow.c:599 src/messageview.c:167
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-_1)"
 
-#: src/compose.c:554 src/mainwindow.c:601 src/messageview.c:169
+#: src/compose.c:555 src/mainwindow.c:601 src/messageview.c:169
 #, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "_Pogled/Nabor zna_kov/Zahodnoevropski (ISO-8859-15)"
 
-#: src/compose.c:558 src/mainwindow.c:605 src/messageview.c:172
+#: src/compose.c:559 src/mainwindow.c:605 src/messageview.c:172
 #, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/_Pogled/Nabor zna_kov/Srednjeevropski (ISO-8859-_2)"
 
-#: src/compose.c:562 src/mainwindow.c:609 src/messageview.c:175
+#: src/compose.c:563 src/mainwindow.c:609 src/messageview.c:175
 #, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/_Pogled/Nabor zna_kov/_Baltski (ISO-8859-13)"
 
-#: src/compose.c:564 src/mainwindow.c:611 src/messageview.c:177
+#: src/compose.c:565 src/mainwindow.c:611 src/messageview.c:177
 #, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/_Pogled/Nabor zna_kov/Baltski (ISO-8859-_4)"
 
-#: src/compose.c:568 src/mainwindow.c:615 src/messageview.c:180
+#: src/compose.c:569 src/mainwindow.c:615 src/messageview.c:180
 #, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:572 src/mainwindow.c:619 src/messageview.c:183
+#: src/compose.c:573 src/mainwindow.c:619 src/messageview.c:183
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/_Pogled/Nabor zna_kov/Grški (ISO-8859-_7)"
 
-#: src/compose.c:574 src/mainwindow.c:621 src/messageview.c:185
+#: src/compose.c:575 src/mainwindow.c:621 src/messageview.c:185
 #, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:578 src/mainwindow.c:625 src/messageview.c:188
+#: src/compose.c:579 src/mainwindow.c:625 src/messageview.c:188
 #, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/_Pogled/Nabor zna_kov/Turški (ISO-8859-_9)"
 
-#: src/compose.c:582 src/mainwindow.c:629 src/messageview.c:191
+#: src/compose.c:583 src/mainwindow.c:629 src/messageview.c:191
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (ISO-8859-_5)"
 
-#: src/compose.c:584 src/mainwindow.c:631 src/messageview.c:193
+#: src/compose.c:585 src/mainwindow.c:631 src/messageview.c:193
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:586 src/mainwindow.c:633 src/messageview.c:195
+#: src/compose.c:587 src/mainwindow.c:633 src/messageview.c:195
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (KOI8-_R)"
 
-#: src/compose.c:588 src/mainwindow.c:635 src/messageview.c:197
+#: src/compose.c:589 src/mainwindow.c:635 src/messageview.c:197
 #, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/_Pogled/Nabor zna_kov/Cirilica (Windows-1251)"
 
-#: src/compose.c:592 src/mainwindow.c:639 src/messageview.c:200
+#: src/compose.c:593 src/mainwindow.c:639 src/messageview.c:200
 #, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/_Pogled/Nabor zna_kov/Japonski (ISO-2022-_JP)"
 
-#: src/compose.c:596 src/mainwindow.c:649 src/messageview.c:209
+#: src/compose.c:597 src/mainwindow.c:649 src/messageview.c:209
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:598 src/mainwindow.c:651 src/messageview.c:211
+#: src/compose.c:599 src/mainwindow.c:651 src/messageview.c:211
 #, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/_Pogled/Nabor zna_kov/Poenostavljena kitajščina (_GB2312)"
 
-#: src/compose.c:600 src/mainwindow.c:653 src/messageview.c:213
+#: src/compose.c:601 src/mainwindow.c:653 src/messageview.c:213
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (_Big5)"
 
-#: src/compose.c:602 src/mainwindow.c:655 src/messageview.c:215
+#: src/compose.c:603 src/mainwindow.c:655 src/messageview.c:215
 #, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/_Pogled/Nabor zna_kov/Tradicionalna kitajščina (EUC-_TW)"
 
-#: src/compose.c:606 src/mainwindow.c:661 src/messageview.c:220
+#: src/compose.c:607 src/mainwindow.c:661 src/messageview.c:220
 #, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/_Pogled/Nabor zna_kov/Korejski (EUC-_KR)"
 
-#: src/compose.c:610 src/mainwindow.c:667 src/messageview.c:225
+#: src/compose.c:611 src/mainwindow.c:667 src/messageview.c:225
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (TIS-620)"
 
-#: src/compose.c:612 src/mainwindow.c:669 src/messageview.c:227
+#: src/compose.c:613 src/mainwindow.c:669 src/messageview.c:227
 #, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/_Pogled/Nabor zna_kov/Tajski (Windows-874)"
 
-#: src/compose.c:616 src/mainwindow.c:726 src/messageview.c:257
+#: src/compose.c:617 src/mainwindow.c:726 src/messageview.c:257
 msgid "/_Tools/_Address book"
 msgstr "/_Orodja/_Adresar"
 
-#: src/compose.c:617
+#: src/compose.c:618
 msgid "/_Tools/_Template"
 msgstr "/_Orodja/_Predloga"
 
-#: src/compose.c:618 src/mainwindow.c:749 src/messageview.c:272
+#: src/compose.c:619 src/mainwindow.c:749 src/messageview.c:272
 msgid "/_Tools/Actio_ns"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:619 src/compose.c:623 src/mainwindow.c:729
+#: src/compose.c:620 src/compose.c:624 src/mainwindow.c:729
 #: src/mainwindow.c:743 src/mainwindow.c:748 src/mainwindow.c:750
 #: src/mainwindow.c:753 src/mainwindow.c:755 src/messageview.c:260
 #: src/messageview.c:271
 msgid "/_Tools/---"
 msgstr "/_Orodja/---"
 
-#: src/compose.c:620
+#: src/compose.c:621
 #, fuzzy
 msgid "/_Tools/Edit with e_xternal editor"
 msgstr "/_Uredi/Uredi z _zunanjim urejevalnikom"
 
-#: src/compose.c:624
+#: src/compose.c:625
 #, fuzzy
 msgid "/_Tools/PGP Si_gn"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:625
+#: src/compose.c:626
 #, fuzzy
 msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:851
+#: src/compose.c:852
 #, c-format
 msgid "%s: file not exist\n"
 msgstr "%s: datoteka ne obstaja\n"
 
-#: src/compose.c:950 src/compose.c:1020 src/procmsg.c:1337
+#: src/compose.c:951 src/compose.c:1021 src/procmsg.c:1337
 msgid "Can't get text part\n"
 msgstr "Ne morem dobiti tekstovnega dela\n"
 
-#: src/compose.c:1404
+#: src/compose.c:1417
 msgid "Quote mark format error."
 msgstr "Napaka pri oblikovanju znaka za citiranje."
 
-#: src/compose.c:1416
+#: src/compose.c:1429
 msgid "Message reply/forward format error."
 msgstr "Napaka pri oblikovanju odgovora/posredovanja sporočila."
 
-#: src/compose.c:1750
+#: src/compose.c:1798
 #, c-format
 msgid "File %s doesn't exist\n"
 msgstr "Datoteka %s ne obstaja\n"
 
-#: src/compose.c:1754
+#: src/compose.c:1802
 #, c-format
 msgid "Can't get file size of %s\n"
 msgstr "Ne morem dobiti velikosti datoteke %s\n"
 
-#: src/compose.c:1758
+#: src/compose.c:1806
 #, c-format
 msgid "File %s is empty."
 msgstr "Datoteka %s je prazna."
 
-#: src/compose.c:1762
+#: src/compose.c:1810
 #, c-format
 msgid "Can't read %s."
 msgstr "Ne morem prebrati %s."
 
-#: src/compose.c:1797
+#: src/compose.c:1845
 #, c-format
 msgid "Message: %s"
 msgstr "Sporočilo: %s"
 
-#: src/compose.c:1869 src/mimeview.c:560
+#: src/compose.c:1917 src/mimeview.c:560
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2303
+#: src/compose.c:2351
 msgid " [Edited]"
 msgstr " [V urejanju]"
 
-#: src/compose.c:2305
+#: src/compose.c:2353
 #, c-format
 msgid "%s - Compose message%s"
 msgstr "%s - Sestavi sporočilo%s"
 
-#: src/compose.c:2308
+#: src/compose.c:2356
 #, c-format
 msgid "Compose message%s"
 msgstr "Sestavi sporočilo%s"
 
-#: src/compose.c:2419
+#: src/compose.c:2467
 msgid "Recipient is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/compose.c:2427
+#: src/compose.c:2475
 #, fuzzy
 msgid "Empty subject"
 msgstr "Zadeva"
 
-#: src/compose.c:2428
+#: src/compose.c:2476
 msgid "Subject is empty. Send it anyway?"
 msgstr "Zadeva sporočila je prazna. Naj kljub temu pošljem?"
 
-#: src/compose.c:2479
+#: src/compose.c:2527
 msgid "can't get recipient list."
 msgstr "ne morem dobiti seznama naslovnikov"
 
-#: src/compose.c:2499
+#: src/compose.c:2547
 msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
@@ -1020,26 +1027,26 @@ msgstr ""
 "Račun za pošiljanje pošte ni določen.\n"
 "Prosim, pred pošiljanjem izberite poštni račun."
 
-#: src/compose.c:2513 src/send_message.c:295
+#: src/compose.c:2561 src/send_message.c:295
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/compose.c:2536
+#: src/compose.c:2584
 msgid "Can't save the message to outbox."
 msgstr "Ne morem shraniti sporočila v imenik Outbox."
 
-#: src/compose.c:2586
+#: src/compose.c:2634
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
 msgstr "Ne najdem tipke, ki bi bila povezana z identifikatorjem tipke `%s'."
 
-#: src/compose.c:2650 src/compose.c:2906 src/compose.c:2969 src/compose.c:3089
+#: src/compose.c:2698 src/compose.c:2954 src/compose.c:3017 src/compose.c:3137
 #: src/utils.c:2246
 msgid "can't change file mode\n"
 msgstr "Ne morem spremeniti pravic do dostopa do datoteke\n"
 
-#: src/compose.c:2682
+#: src/compose.c:2730
 #, fuzzy, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
@@ -1049,12 +1056,12 @@ msgstr ""
 "Ne morem pretvoriti nabora znakov sporočila.\n"
 "Naj ga kljub temu pošljem?"
 
-#: src/compose.c:2688
+#: src/compose.c:2736
 #, fuzzy
 msgid "Code conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/compose.c:2757
+#: src/compose.c:2805
 #, c-format
 msgid ""
 "Line %d exceeds the line length limit (998 bytes).\n"
@@ -1063,156 +1070,156 @@ msgid ""
 "Send it anyway?"
 msgstr ""
 
-#: src/compose.c:2761
+#: src/compose.c:2809
 msgid "Line length limit"
 msgstr ""
 
-#: src/compose.c:3049
+#: src/compose.c:3097
 msgid "can't remove the old message\n"
 msgstr "ne morem odstraniti starega sporočila\n"
 
-#: src/compose.c:3067
+#: src/compose.c:3115
 msgid "queueing message...\n"
 msgstr "prestavljam sporočilo v mapo Čakajoče...\n"
 
-#: src/compose.c:3149
+#: src/compose.c:3197
 msgid "can't find queue folder\n"
 msgstr "ne najdem mape s čakajočimi sporočili\n"
 
-#: src/compose.c:3156
+#: src/compose.c:3204
 msgid "can't queue the message\n"
 msgstr "ne morem preložiti sporočila\n"
 
-#: src/compose.c:3736
+#: src/compose.c:3784
 #, c-format
 msgid "generated Message-ID: %s\n"
 msgstr "generiran Message-ID: %s\n"
 
-#: src/compose.c:3845
+#: src/compose.c:3893
 msgid "Creating compose window...\n"
 msgstr "Odpiram okno za sestavljanje sporočila...\n"
 
-#: src/compose.c:3893 src/headerview.c:54 src/summary_search.c:214
+#: src/compose.c:3941 src/headerview.c:54 src/summary_search.c:214
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:3965
+#: src/compose.c:4013
 #, fuzzy
 msgid "PGP Sign"
 msgstr "/_Orodja/Deja_nja"
 
-#: src/compose.c:3968
+#: src/compose.c:4016
 #, fuzzy
 msgid "PGP Encrypt"
 msgstr "/_Sporočilo/_Enkripcija"
 
-#: src/compose.c:4006 src/compose.c:4946
+#: src/compose.c:4054 src/compose.c:4993
 msgid "MIME type"
 msgstr "Tip MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4015 src/mimeview.c:192 src/prefs_filter_edit.c:585
+#: src/compose.c:4063 src/mimeview.c:192 src/prefs_filter_edit.c:585
 #: src/prefs_summary_column.c:75 src/select-keys.c:317 src/summaryview.c:4209
 msgid "Size"
 msgstr "Velikost"
 
-#: src/compose.c:4394 src/mainwindow.c:2224 src/prefs_account.c:718
+#: src/compose.c:4441 src/mainwindow.c:2224 src/prefs_account.c:718
 #: src/prefs_common.c:943
 msgid "Send"
 msgstr "Pošlji"
 
-#: src/compose.c:4395
+#: src/compose.c:4442
 msgid "Send message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:4403
+#: src/compose.c:4450
 msgid "Send later"
 msgstr "Pošlji kasneje"
 
-#: src/compose.c:4404
+#: src/compose.c:4451
 msgid "Put into queue folder and send later"
 msgstr "Postavi v mapo Čakajoče in pošlji kasneje"
 
-#: src/compose.c:4412
+#: src/compose.c:4459
 msgid "Draft"
 msgstr "Osnutek"
 
-#: src/compose.c:4413
+#: src/compose.c:4460
 msgid "Save to draft folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/compose.c:4423 src/compose.c:5754
+#: src/compose.c:4470
 msgid "Insert"
 msgstr "Vstavi"
 
-#: src/compose.c:4424
+#: src/compose.c:4471
 msgid "Insert file"
 msgstr "Vstavi datoteko"
 
-#: src/compose.c:4432
+#: src/compose.c:4479
 msgid "Attach"
 msgstr "Pripni"
 
-#: src/compose.c:4433
+#: src/compose.c:4480
 msgid "Attach file"
 msgstr "Pripni datoteko"
 
 #. signature
-#: src/compose.c:4443 src/prefs_account.c:1390 src/prefs_common.c:1352
+#: src/compose.c:4490 src/prefs_account.c:1390 src/prefs_common.c:1352
 msgid "Signature"
 msgstr "Podpis"
 
-#: src/compose.c:4444
+#: src/compose.c:4491
 msgid "Insert signature"
 msgstr "Vstavi podpis"
 
-#: src/compose.c:4453 src/prefs_common.c:1374 src/prefs_common.c:2378
+#: src/compose.c:4500 src/prefs_common.c:1374 src/prefs_common.c:2378
 msgid "Editor"
 msgstr "Urejevalnik"
 
-#: src/compose.c:4454
+#: src/compose.c:4501
 msgid "Edit with external editor"
 msgstr "Urejanje z zunanjim urejevalnikom"
 
-#: src/compose.c:4462
+#: src/compose.c:4509
 msgid "Linewrap"
 msgstr "Prelom vrstic"
 
-#: src/compose.c:4463
+#: src/compose.c:4510
 msgid "Wrap all long lines"
 msgstr "Prelomi vse dolge vrstice"
 
-#: src/compose.c:4842
+#: src/compose.c:4889
 msgid "Invalid MIME type."
 msgstr "Napačen tip MIME"
 
-#: src/compose.c:4860
+#: src/compose.c:4907
 msgid "File doesn't exist or is empty."
 msgstr "Datoteka ne obstaja ali pa je prazna."
 
-#: src/compose.c:4928
+#: src/compose.c:4975
 #, fuzzy
 msgid "Properties"
 msgstr "Lastnost"
 
-#: src/compose.c:4948
+#: src/compose.c:4995
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:4971 src/prefs_folder_item.c:183
+#: src/compose.c:5018 src/prefs_folder_item.c:183
 msgid "Path"
 msgstr "Pot"
 
-#: src/compose.c:4972
+#: src/compose.c:5019
 msgid "File name"
 msgstr "Ime datoteke"
 
-#: src/compose.c:5126
+#: src/compose.c:5174
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za zunanji urejevalnik je neveljavna: '%s'\n"
 
-#: src/compose.c:5152
+#: src/compose.c:5200
 #, c-format
 msgid ""
 "The external editor is still working.\n"
@@ -1223,73 +1230,79 @@ msgstr ""
 "Ali naj ga prisilim k prekinitvi?\n"
 "Št. skupine procesov: %d"
 
-#: src/compose.c:5167
+#: src/compose.c:5217
 #, c-format
 msgid "Terminated process group id: %d"
 msgstr "Št. prekinjene skupine procesov: %d"
 
-#: src/compose.c:5168
+#: src/compose.c:5218
 #, c-format
 msgid "Temporary file: %s"
 msgstr "Začasna datoteka: %s"
 
-#: src/compose.c:5192
+#: src/compose.c:5242
 msgid "Compose: input from monitoring process\n"
 msgstr "Sestavljanje: vhod iz opazovanega procesa\n"
 
 #. failed
-#: src/compose.c:5233
+#: src/compose.c:5273
 msgid "Couldn't exec external editor\n"
 msgstr "Ne morem pognati zunanjega urejevalnika\n"
 
-#: src/compose.c:5237
+#: src/compose.c:5277
 msgid "Couldn't write to file\n"
 msgstr "Ne morem pisati v datoteko\n"
 
-#: src/compose.c:5239
+#: src/compose.c:5279
 msgid "Pipe read failed\n"
 msgstr "Branje preko cevi ni uspelo\n"
 
-#: src/compose.c:5544 src/compose.c:5552 src/compose.c:5558
+#: src/compose.c:5584 src/compose.c:5592 src/compose.c:5598
 msgid "Can't queue the message."
 msgstr "Ne morem preložiti pošiljanja sporočila."
 
-#: src/compose.c:5649
+#: src/compose.c:5689
 #, fuzzy
 msgid "Select files"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:5671
+#: src/compose.c:5711
 msgid "Select file"
 msgstr "Izberi datoteko"
 
-#: src/compose.c:5706
+#: src/compose.c:5746
 #, fuzzy
 msgid "Save message"
 msgstr "Pošlji sporočilo"
 
-#: src/compose.c:5707
+#: src/compose.c:5747
 #, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
 msgstr "To sporočilo je bilo spremenjeno. Naj ga zavržem?"
 
-#: src/compose.c:5709
+#: src/compose.c:5749
 msgid "Close _without saving"
 msgstr ""
 
-#: src/compose.c:5751
+#: src/compose.c:5791
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
 msgstr "Ali želite uporabiti predlogo `%s' ?"
 
-#: src/compose.c:5753
+#: src/compose.c:5793
 msgid "Apply template"
 msgstr "Uporabi predlogo"
 
-#: src/compose.c:5754
-msgid "Replace"
+#: src/compose.c:5794
+#, fuzzy
+msgid "_Replace"
 msgstr "Zamenjaj"
 
+#: src/compose.c:5794
+#, fuzzy
+msgid "_Insert"
+msgstr "Vstavi"
+
 #. gtk_container_set_border_width(GTK_CONTAINER(window), 8);
 #: src/editaddress.c:182
 msgid "Edit address"
@@ -1813,10 +1826,6 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:2125
-msgid "Delete folder"
-msgstr "Izbriši mapo"
-
 #: src/folderview.c:2150
 #, c-format
 msgid "Can't remove the folder `%s'."
@@ -6057,7 +6066,8 @@ msgid "Scanning folder (%s)..."
 msgstr "Preiskujem mapo (%s) ..."
 
 #: src/summaryview.c:1147
-msgid "Search again"
+#, fuzzy
+msgid "_Search again"
 msgstr "Ponovno iskanje"
 
 #: src/summaryview.c:1168 src/summaryview.c:1177
@@ -6317,9 +6327,14 @@ msgstr ""
 msgid ""
 "The real URL (%s) is different from\n"
 "the apparent URL (%s).\n"
+"\n"
 "Open it anyway?"
 msgstr ""
 
+#: src/textview.c:2072
+msgid "Fake URL warning"
+msgstr ""
+
 #: src/utils.c:181
 #, c-format
 msgid "%dB"