modified the message of deleting search folder.

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

29 files changed, 2374 insertions, 2434 deletions

diff --git a/po/bg.po b/po/bg.po
index 8daac456..aee40dd5 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2004-01-09 02:06+0200\n"
 "Last-Translator: Pavel Pyuter <pavel@unix-bg.org>\n"
 "Language-Team: Bulgarian <bg@li.org>\n"
@@ -1045,7 +1045,7 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
@@ -1180,7 +1180,7 @@ msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Папка"
 
@@ -1607,7 +1607,7 @@ msgstr "Съобщение: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
@@ -2248,7 +2248,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може да бъде включено в име на папка"
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папката `%s' вече съществува"
@@ -2409,19 +2409,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Желаете ли премахване на пощенската кутия `%s'?\n"
+"(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Изтриване на папка"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2432,21 +2433,21 @@ msgstr ""
 "Всички папки и съобщения под `%s' ше бъдат изтрити.\n"
 "Наистина ли желаете изтриване?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2455,34 +2456,34 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Желаете ли изтриване на IMAP4 акаунт `%s'?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Изтриване на IMAP4 акаунт"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Желаете ли изтриване на новинарска група `%s'?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Изтриване на новинарска група"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Желаете ли изтриване на новинарски акаунт `%s'?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Изтриване на новинарски акаунт"
 
@@ -2498,7 +2499,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Създаване изглед на заглавните блокове...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Няма От)"
 
@@ -3801,7 +3802,7 @@ msgstr "Намиране в текущото съобщение"
 msgid "Find text:"
 msgstr "Намиране на текст:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Чувствителност към размера на символите"
 
@@ -5682,25 +5683,25 @@ msgstr "Не е въведен команден ред."
 msgid "Destination folder is not specified."
 msgstr "Не е указано назначение."
 
-#: src/prefs_filter_edit.c:1791
+#: src/prefs_filter_edit.c:1795
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1818
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Не е указан получател"
 
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Не е въведен команден ред."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: файлът не съществува\n"
@@ -5752,19 +5753,19 @@ msgid "Attachment"
 msgstr "Притурка"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Дата"
@@ -6159,7 +6160,7 @@ msgstr "Не може да се получи списък на новинарс�
 msgid "Can't retrieve newsgroup list."
 msgstr "Не може да се получи списък на новинарската група"
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Изпълнено."
 
@@ -6168,58 +6169,58 @@ msgstr "Изпълнено."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d новинарски групи получени (%s прочетени)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Търсене на съобщения"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Папка"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Търсенето се провали"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Няма Дата)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Запазване в папката с чернови"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Име на файл"
@@ -6564,36 +6565,36 @@ msgstr "Създаване на текстов изглед...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Съобщението не може да бъде показано.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Запазване като..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Съставяне на ново съобщение"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Добавяне на подателя в адресната книга"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Публичен адрес"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Уеб браузър"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6602,7 +6603,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/cs.po b/po/cs.po
index bc39aee2..180a39fb 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2003-05-30 13:31GMT+0100\n"
 "Last-Translator: Radek Vybíral <Radek.Vybiral@vsb.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -1047,7 +1047,7 @@ msgstr ""
 "Chcete smazat složku '%s' A TAKÉ všechny adresy v ní? \n"
 "Pokud smažete pouze složku, adresy budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Smazat složku "
 
@@ -1181,7 +1181,7 @@ msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Složka"
 
@@ -1608,7 +1608,7 @@ msgstr "Zpráva: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Nemohu získat část z mnohačásťové zprávy."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
@@ -2250,7 +2250,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "%c nemůže být obsaženo ve jméně složky."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Složka '%s' už existuje."
@@ -2412,19 +2412,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Opravdu odebrat poštovní schránku '%s'?\n"
+"(Zprávy NEBUDOU smazány z disku)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Smazat složku "
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2435,21 +2436,21 @@ msgstr ""
 "Všechny složky a zprávy v '%s' budou vymazány.\n"
 "Chcete je opravdu smazat ?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2458,34 +2459,34 @@ msgstr ""
 "Opravdu odebrat poštovní schránku '%s'?\n"
 "(Zprávy NEBUDOU smazány z disku)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat IMAP4 účet '%s'?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Smazat IMAP4 účet"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu chcete smazat diskusní skupinu '%s' ?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Smazat diskusní skupinu"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat účet pro diskusní skupinu '%s'?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Smazat účet pro diskuzní skupinu"
 
@@ -2501,7 +2502,7 @@ msgstr "Předmět:"
 msgid "Creating header view...\n"
 msgstr "Vytvářím náhled na záhlaví...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(není znám odesílatel)"
 
@@ -3805,7 +3806,7 @@ msgstr "Hledat v aktuální zprávě"
 msgid "Find text:"
 msgstr "Najít text:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Rozlišovat malá a velká písmena"
 
@@ -5684,26 +5685,26 @@ msgstr "Není nastavena příkazová řádka."
 msgid "Destination folder is not specified."
 msgstr "Místo určení není nastavené."
 
-#: src/prefs_filter_edit.c:1791
+#: src/prefs_filter_edit.c:1795
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1818
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Není uveden příjemce."
 
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1844
 #, fuzzy
 msgid "Invalid action exists."
 msgstr "Nesprávný měsíc\n"
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Není nastavena příkazová řádka."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: soubor neexistuje\n"
@@ -5755,19 +5756,19 @@ msgid "Attachment"
 msgstr "Příloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Předmět"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Datum"
@@ -6162,7 +6163,7 @@ msgstr "vymazávám diskusní skupinu %s ...\n"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nemohu načíst seznam diskuzních skupin."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Hotovo."
 
@@ -6171,59 +6172,59 @@ msgstr "Hotovo."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d diskuzních skupin přijato (%s čteno)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Vyhledat zprávy"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Automaticky nastavit následující adresy"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Složka"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Vyhledání složky"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Vyhledání složky"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Prohledávám složku %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtruji..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Žádné datum)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Vyhledání složky"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 #, fuzzy
 msgid "Location:"
 msgstr "Přerušení akcí"
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Název souboru"
@@ -6570,36 +6571,36 @@ msgstr "Vytvářím zobrazení textu...\n"
 msgid "This message can't be displayed.\n"
 msgstr "zpráva nebyla přijata\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Uložit jako..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Vytváří novou zprávu"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Přidat odesílatele do data_báze adres"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Společná adresa"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webový prohlížeč"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6608,7 +6609,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/da.po b/po/da.po
index 7dabd1ff..8773d3d8 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -1048,7 +1048,7 @@ msgstr ""
 "Vil du virkeligt slette mappen OG alla adresser i `%s' ? \n"
 "Hvis kun mappen slettes, vil adresserne blive flyttet til hoved mappen."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Slet mappe"
 
@@ -1178,7 +1178,7 @@ msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Mappe"
 
@@ -1605,7 +1605,7 @@ msgstr "Meddelelse: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Intet emne)"
@@ -2246,7 +2246,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
@@ -2408,19 +2408,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Virklig slette `%s'?\n"
+"(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2431,21 +2432,21 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2454,34 +2455,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
@@ -2497,7 +2498,7 @@ msgstr "Emne:"
 msgid "Creating header view...\n"
 msgstr "Opretter hoved visning...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Ingen Fra)"
 
@@ -3804,7 +3805,7 @@ msgstr "Søg i aktuel meddelelse"
 msgid "Find text:"
 msgstr "Søg tekst:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Stor / små forskel"
 
@@ -5680,25 +5681,25 @@ msgstr "Kommando linie ikke opsat."
 msgid "Destination folder is not specified."
 msgstr "Destination ikke valgt."
 
-#: src/prefs_filter_edit.c:1791
+#: src/prefs_filter_edit.c:1795
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1818
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Mangler modtager"
 
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Kommando linie ikke opsat."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: fil findes ikke\n"
@@ -5750,19 +5751,19 @@ msgid "Attachment"
 msgstr "Vedhæftet"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Dato"
@@ -6160,7 +6161,7 @@ msgstr "Kan ikke modtage gruppe liste."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan ikke modtage gruppe liste."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Afsluttet."
 
@@ -6169,59 +6170,59 @@ msgstr "Afsluttet."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d Nyhedsgruppe(r) modtaget (%s læst)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Søg meddelelse"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Mappe"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Gennemsøg mappe"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Gennemsøg mappe"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Ingen dato)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Gennemsøg mappe"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 #, fuzzy
 msgid "Location:"
 msgstr "Afbryd handling"
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Fil navn"
@@ -6570,36 +6571,36 @@ msgstr "Opretter tekst vindue...\n"
 msgid "This message can't be displayed.\n"
 msgstr "en meddelelse vil ikke blive modtaget\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gem som..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Opret ny meddelelse"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Tilføj afsender til adressebo_g"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Normale adresser"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web browser"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6608,7 +6609,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/de.po b/po/de.po
index d7fa69f8..9bac9c76 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2006-01-04 09:13+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -1050,7 +1050,7 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
@@ -1184,7 +1184,7 @@ msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Ablage"
 
@@ -1577,7 +1577,7 @@ msgstr "Nachricht: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
@@ -2211,7 +2211,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "'%c' kann nicht in den Ablagenamen integriert werden."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage '%s' existiert bereits."
@@ -2368,19 +2368,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Kann Ablage '%s' nicht verschieben."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Mailbox '%s' entfernen?\n"
+"(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ablage löschen"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2393,20 +2394,20 @@ msgstr ""
 "\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kann Ablage '%s' nicht entfernen."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 msgid "Delete all messages in the trash folder?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2415,34 +2416,34 @@ msgstr ""
 "Mailbox '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup '%s' wirklich löschen?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "News-Account löschen"
 
@@ -2458,7 +2459,7 @@ msgstr "Betreff:"
 msgid "Creating header view...\n"
 msgstr "Erzeuge Kopfzeilenansicht...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Kein Von)"
 
@@ -3730,7 +3731,7 @@ msgstr "Aktuelle Nachricht durchsuchen"
 msgid "Find text:"
 msgstr "Text suchen:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung"
 
@@ -5554,23 +5555,23 @@ msgstr "Befehl wurde nicht gesetzt."
 msgid "Destination folder is not specified."
 msgstr "Zielablage wurde nicht angegeben."
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "Regelname wurde nicht angegeben."
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "Es existiert eine ungültige Bedingung."
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "Regelname wurde nicht angegeben."
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "Es existiert eine ungültige Aktion."
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "Die Bedingung existiert nicht."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "Die Aktion existiert nicht."
 
@@ -5622,19 +5623,19 @@ msgid "Attachment"
 msgstr "Anhang"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Datum"
@@ -6040,7 +6041,7 @@ msgstr "Hole Newsgroup-Liste..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kann die Newsgroup-Liste nicht empfangen."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Fertig."
 
@@ -6049,53 +6050,53 @@ msgstr "Fertig."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d Newsgruppe(n) empfangen (%s gelesen)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Suche Nachrichten"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "Wenn eine der folgenden Bedingungen zutrifft"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "Wenn alle der folgenden Bedingungen zutreffen"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 msgid "Folder:"
 msgstr "Ablage:"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 msgid "Search subfolders"
 msgstr "Suche Unterablagen"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 msgid "_Save as search folder"
 msgstr "_Speichern in Suchablage"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, c-format
 msgid "Searching %s ..."
 msgstr "Suche %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Suche %s (%d / %d)..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 msgid "Save as search folder"
 msgstr "Speichern in Suchablage"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr "Speicherort:"
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 msgid "Folder name:"
 msgstr "Ablage Name:"
 
@@ -6436,31 +6437,31 @@ msgstr "Erstelle Textansicht...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Diese Nachricht kann nicht dargestellt werden.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "/Speichere dieses Bild _als..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 msgid "Compose _new message"
 msgstr "Neue Nachricht verfassen"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 msgid "Add to address _book..."
 msgstr "Absender in Adress_buch einfügen"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 msgid "Copy this add_ress"
 msgstr "Kopiere diese Adresse"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr "Öffne _mit Internet-Browser"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "Kopiere diese _Verknüpfung"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6473,6 +6474,6 @@ msgstr ""
 "\n"
 "Trotzdem öffnen?"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr "Falsche URL Warnung"
diff --git a/po/el.po b/po/el.po
index 847891a7..467eabba 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2001-10-08\n"
 "Last-Translator: Michalis Kabrianis <Michalis@bigfoot.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -1058,7 +1058,7 @@ msgstr ""
 "Αν διαγράφετε τον κατάλογο μόνο, οι διευθύνσεις θα μετακινηθούν στον από "
 "πάνω κατάλογο"
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Διαγραφή καταλόγου"
 
@@ -1186,7 +1186,7 @@ msgstr "ΝέαΟμάδα"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Κατάλογος"
 
@@ -1628,7 +1628,7 @@ msgstr "Μήνυμα: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Δεν μπορώ να λάβω το τμήμα του πολυτμηματικού μηνύματος"
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Χωρίς Θέμα)"
@@ -2284,7 +2284,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "το `%c' δεν μπορεί να συμπεριλαμβάνεται σε όνομα καταλόγου."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Ο κατάλογος `%s' υπάρχει ήδη."
@@ -2453,19 +2453,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
+"(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Διαγραφή καταλόγου"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2476,21 +2477,21 @@ msgstr ""
 "Όλοι οι κατάλογοι και τα μηνύματα κάτω από το `%s' θα διαγραφούν.\n"
 "Θέλετε πράγματι να διαγραφούν;"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2499,35 +2500,35 @@ msgstr ""
 "Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Διαγραφή mailbox"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο IMAP4 λογαριασμός `%s';"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Διαγραφή λογαριασμού IMAP4"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Σίγουρα να διαγραφεί το newsgroup `%s';"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Διαγραφή newsgroup"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο λογαριασμός news `%s';"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Διαγραφή λογαριασμού news"
 
@@ -2543,7 +2544,7 @@ msgstr "Θέμα:"
 msgid "Creating header view...\n"
 msgstr "Δημιουργώ την απεικόνιση κεφαλίδας...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Χωρίς αποστολέα)"
 
@@ -3935,7 +3936,7 @@ msgstr "Αποστολή μηνύματος"
 msgid "Find text:"
 msgstr ""
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Διαχωρισμός πεζών/κεφαλαίων"
 
@@ -5820,25 +5821,25 @@ msgstr "Το όνομα της κεφαλίδας δεν έχει οριστεί
 msgid "Destination folder is not specified."
 msgstr "Ο προορισμός δεν έχει οριστεί."
 
-#: src/prefs_filter_edit.c:1791
+#: src/prefs_filter_edit.c:1795
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1818
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Ο παραλήπτης δεν έχει οριστεί."
 
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Το όνομα της κεφαλίδας δεν έχει οριστεί."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: το αρχείο δεν υπάρχει\n"
@@ -5894,19 +5895,19 @@ msgid "Attachment"
 msgstr "Προσάρτηση"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Ημερομηνία"
@@ -6316,7 +6317,7 @@ msgstr "δεν μπορώ να πάρω την λίστα των newsgroup"
 msgid "Can't retrieve newsgroup list."
 msgstr "δεν μπορώ να πάρω την λίστα των newsgroup"
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Τέλος"
 
@@ -6325,60 +6326,60 @@ msgstr "Τέλος"
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroups λήφθηκαν (%s διαβασμένα)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 #, fuzzy
 msgid "Search messages"
 msgstr "\tΑναζήτηση στα απροσπέλαστα μηνύματα... "
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Κατάλογος"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Επιλογή καταλόγου"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Επιλογή καταλόγου"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Σάρωση καταλόγου %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Φιλτράρω..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Χωρίς ημερομηνία)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Επιλογή καταλόγου"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 #, fuzzy
 msgid "Location:"
 msgstr "Παράθεση"
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Όνομα αρχείου"
@@ -6742,35 +6743,35 @@ msgstr "Δημιουργώ απεικόνιση κειμένου...\n"
 msgid "This message can't be displayed.\n"
 msgstr "ένα μήνυμα δεν θα παραληφθεί\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Αποθήκευση ως..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Κοινές διευθύνσεις"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr ""
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6779,7 +6780,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/es.po b/po/es.po
index 402250d1..7e522595 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2005-07-08 21:08+0100\n"
 "Last-Translator: Ricardo Mones <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones <mones@aic.uniovi.es>\n"
@@ -1048,7 +1048,7 @@ msgstr ""
 "¿Quiere borrar la carpeta Y todas las direcciones en «%s»? \n"
 "Si sólo borra la carpeta las direcciones se moverán a la carpeta padre."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1182,7 +1182,7 @@ msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -1577,7 +1577,7 @@ msgstr "Mensaje: %s"
 msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
@@ -2216,7 +2216,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' no puede estar en el nombre de la carpeta."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta «%s» ya existe."
@@ -2374,19 +2374,20 @@ msgid "Can't move the folder `%s'."
 msgstr "No se puede mover la carpeta «%s»."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"¿Realmente desea eliminar el buzón «%s» ?\n"
+"(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2399,21 +2400,21 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarla?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede eliminar la carpeta «%s»."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Vaciar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2422,34 +2423,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 «%s»?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias «%s»?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias «%s»?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -2465,7 +2466,7 @@ msgstr "Asunto:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -3741,7 +3742,7 @@ msgstr "Buscar en el mensaje actual"
 msgid "Find text:"
 msgstr "Buscar texto:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Mayús./minús."
 
@@ -5568,23 +5569,23 @@ msgstr "No se especificó la orden."
 msgid "Destination folder is not specified."
 msgstr "No se especificó la carpeta de destino."
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "No se especificó el nombre de la regla."
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "Existe una condición inválida."
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "No se especificó el nombre de la regla."
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "Existe una orden inválida."
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "No existe la condición."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "No existe la acción."
 
@@ -5635,19 +5636,19 @@ msgid "Attachment"
 msgstr "Adjunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Fecha"
@@ -6043,7 +6044,7 @@ msgstr "No se puede obtener la lista de grupos."
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Hecho."
 
@@ -6052,57 +6053,57 @@ msgstr "Hecho."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de noticias recibidos (%s leídos)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Buscar en los mensajes"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "Coincidir con alguna de las siguientes"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "Coincidir con todas las siguientes"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Carpeta"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Búsqueda fallida"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Guardar como borrador"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Guardar como borrador"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Nombre de fichero"
@@ -6449,31 +6450,31 @@ msgstr "Creando vista de texto...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Este mensaje no puede visualizarse.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "_Guardar imagen como..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 msgid "Compose _new message"
 msgstr "Componer mensaje _nuevo"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 msgid "Add to address _book..."
 msgstr "Añadir _remitente a la agenda..."
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 msgid "Copy this add_ress"
 msgstr "Copiar esta di_rección"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr "_Abrir con el navegador web"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "Copiar el en_lace"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6485,7 +6486,7 @@ msgstr ""
 "URL aparente (%s).\n"
 "¿Quiere abrirla de todas maneras?"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
diff --git a/po/et.po b/po/et.po
index efd2610b..0e3cf12c 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2002-10-02 09:08+0300\n"
 "Last-Translator: Peeter Vois <Peeter.Vois@mail.ee>\n"
 "Language-Team: Estonian <et@li.org>\n"
@@ -1050,7 +1050,7 @@ msgstr ""
 "Kas te soovite kustutada kataloogi `%s' JA kõik aadressid ?\n"
 "Kui kustutate ainult kataloogi, siis aadressid kantakse pealmisse kausta."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
@@ -1185,7 +1185,7 @@ msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Kaust"
 
@@ -1613,7 +1613,7 @@ msgstr "Kiri: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
@@ -2255,7 +2255,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "Sümbol `%c' ei saa olla lisatud kausta nimele."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
@@ -2420,19 +2420,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Kas tõepoolest eemaldada kirjakast %s?\n"
+"(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Kustuta kaust"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2443,21 +2444,21 @@ msgstr ""
 "Kustutatakse kõik kaustad ja kirjad %s-s.\n"
 "Kas sa tõesti soovid kustutada?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2466,34 +2467,34 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas tõesti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas tõesti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas tõesti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
@@ -2509,7 +2510,7 @@ msgstr "Pealkiri:"
 msgid "Creating header view...\n"
 msgstr "Loon päise vaadet...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Eikelleltki)"
 
@@ -3808,7 +3809,7 @@ msgstr "Avatud kirjast otsiine"
 msgid "Find text:"
 msgstr "Otsi teksti:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Tõstutundlik"
 
@@ -5684,25 +5685,25 @@ msgstr "Käsurida ei ole sisestatud."
 msgid "Destination folder is not specified."
 msgstr "Sihtkaust pole määratud."
 
-#: src/prefs_filter_edit.c:1791
+#: src/prefs_filter_edit.c:1795
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1818
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Saaja pole määratud."
 
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 #, fuzzy
 msgid "Action not exist."
 msgstr "faili %s ei leidu\n"
@@ -5756,19 +5757,19 @@ msgid "Attachment"
 msgstr "Manus"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Kuupäev"
@@ -6163,7 +6164,7 @@ msgstr "Ei saanud uudistegrupi nimistut."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ei saanud uudistegrupi nimistut."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Tehtud."
 
@@ -6172,59 +6173,59 @@ msgstr "Tehtud."
 msgid "%d newsgroups received (%s read)"
 msgstr "saadi %d uudistegruppi (%s loetud)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Otsi kirju"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Kaust"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Kataloogist otsimine"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Kataloogist otsimine"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Kuupäeva pole)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Kataloogist otsimine"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 #, fuzzy
 msgid "Location:"
 msgstr "Tsiteerimine"
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Failinimi"
@@ -6571,36 +6572,36 @@ msgstr "Loon tekstivaate...\n"
 msgid "This message can't be displayed.\n"
 msgstr "kirja ei saanud\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Salveta kui..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kirjuta uus kiri"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Lisa saatje aadressi raamatusse"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Üldine aadress"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Weebi sirvur"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6609,7 +6610,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/fr.po b/po/fr.po
index 19cc1d83..07dc4028 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2005-08-08 23:57+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -1061,7 +1061,7 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
@@ -1196,7 +1196,7 @@ msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Dossier"
 
@@ -1593,7 +1593,7 @@ msgstr "Message : %s"
 msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
@@ -2233,7 +2233,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "« %c » n'est pas valide dans le nom du dossier."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
@@ -2392,19 +2392,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Impossible de déplacer le dossier « %s »."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Ne plus utiliser la boîte aux lettres « %s » (les\n"
+"messages existants ne seront PAS effacés du disque) ?"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Suppression de dossier"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2415,21 +2416,21 @@ msgstr ""
 "Tous les dossiers et messages sous « %s » vont être définitivement effacés.\n"
 "Voulez-vous vraiment les effacer ?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible de supprimer le dossier « %s »."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Supprimer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2438,34 +2439,34 @@ msgstr ""
 "Ne plus utiliser la boîte aux lettres « %s » (les\n"
 "messages existants ne seront PAS effacés du disque) ?"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -2481,7 +2482,7 @@ msgstr "Sujet :"
 msgid "Creating header view...\n"
 msgstr "Création de la vue des en-têtes...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
 
@@ -3767,7 +3768,7 @@ msgstr "Recherche dans le message"
 msgid "Find text:"
 msgstr "Texte recherché :"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Respecter la casse"
 
@@ -5601,23 +5602,23 @@ msgstr "La commande n'a pas été définie."
 msgid "Destination folder is not specified."
 msgstr "Le dossier cible n'a pas été défini."
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "Le nom de la règle n'est pas spécifié."
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "Une condition invalide est présente."
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "Le nom de la règle n'est pas spécifié."
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "Une action invalide est présente."
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "La condition n'existe pas."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "L'action n'existe pas."
 
@@ -5668,19 +5669,19 @@ msgid "Attachment"
 msgstr "Pièces jointes"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Date"
@@ -6078,7 +6079,7 @@ msgstr "Impossible d'obtenir la liste des groupes de discussion."
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossible d'obtenir la liste des groupes de discussion."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Terminé."
 
@@ -6087,57 +6088,57 @@ msgstr "Terminé."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d groupes de discussion reçus (%s lu)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Recherche dans le dossier"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "Si au moins une des conditions suivantes est remplie"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "Si toutes les conditions suivantes sont remplies"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Dossier"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "La recherche a échoué"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Tri en cours..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(aucune date)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Enregistrer dans le dossier brouillon"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Nom du fichier"
@@ -6486,31 +6487,31 @@ msgstr "Création de la vue texte...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Impossible d'afficher ce message.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "Enregistrer cette _image sous..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 msgid "Compose _new message"
 msgstr "Composer un _nouveau message"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 msgid "Add to address _book..."
 msgstr "_Ajouter au carnet d'adresses..."
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 msgid "Copy this add_ress"
 msgstr "Copier cette ad_resse"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr "_Ouvrir dans le navigateur Web"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "Copier ce _lien"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6522,7 +6523,7 @@ msgstr ""
 "\n"
 "Voulez-vous néanmoins l'ouvrir ?"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr "Localisateur (URL) suspect"
 
diff --git a/po/gl.po b/po/gl.po
index a7dc8f06..df55556b 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -1048,7 +1048,7 @@ msgstr ""
 "¿Quere borrar a carpeta E todos os enderezos en `%s'? \n"
 "Si so borra a carpeta os enderezos se moverán á carpeta pai."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1184,7 +1184,7 @@ msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Carpeta"
 
@@ -1612,7 +1612,7 @@ msgstr "Mensaxe: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
@@ -2254,7 +2254,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' non pode estar no nome da carpeta."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
@@ -2416,19 +2416,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
+"(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2439,21 +2440,21 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' serán borrados.\n"
 "¿Confirma o borrado?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2462,34 +2463,34 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
@@ -2505,7 +2506,7 @@ msgstr "Asunto:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -3809,7 +3810,7 @@ msgstr "Buscar no mensaxe actual"
 msgid "Find text:"
 msgstr "Buscar texto:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Maiús./minús."
 
@@ -5684,25 +5685,25 @@ msgstr "Non se estableceu o comando."
 msgid "Destination folder is not specified."
 msgstr "Non se especificou destinatario."
 
-#: src/prefs_filter_edit.c:1791
+#: src/prefs_filter_edit.c:1795
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1818
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Non se especificou o destinatario."
 
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Non se estableceu o comando."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: o ficheiro non existe\n"
@@ -5754,19 +5755,19 @@ msgid "Attachment"
 msgstr "Adxunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Data"
@@ -6161,7 +6162,7 @@ msgstr "Non se pode obter a lista de grupos."
 msgid "Can't retrieve newsgroup list."
 msgstr "Non se pode obter a lista de grupos."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Feito."
 
@@ -6170,58 +6171,58 @@ msgstr "Feito."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de novas recibidos (%s leídos)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Buscar nas mensaxes"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Carpeta"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Búsqueda fallida"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Gardar como borrador"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Sin data)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Gardar como borrador"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Nome de ficheiro"
@@ -6568,36 +6569,36 @@ msgstr "Creando vista de texto...\n"
 msgid "This message can't be displayed.\n"
 msgstr "unha mensaxe non será recibido\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Gardar como..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Compoñer mensaxe novo"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Engadir _remitente á axenda"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Enderezo común"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Navegador web"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6606,7 +6607,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/hr.po b/po/hr.po
index 8d5b5c31..7b8d6e78 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2001-09-17 13:22+0100\n"
 "Last-Translator: Ante Karamatić <ante@cdnet.com.hr>\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -1053,7 +1053,7 @@ msgstr ""
 "Želite li obrisati spis I sve adrese u `%s' ? \n"
 "Ukoliko brišete samo spis, adrese će biti premještene u prethodni spis."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Obriši spis"
 
@@ -1181,7 +1181,7 @@ msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Spis"
 
@@ -1622,7 +1622,7 @@ msgstr "Poruka: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Bez teme)"
@@ -2266,7 +2266,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uključen u ime spisa."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' već postoji."
@@ -2433,19 +2433,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Uistinu premjestiti spis `%s' ?\n"
+"(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši spis"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2456,21 +2457,21 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti će obrisane.\n"
 "Želite li ih uistinu obrisati?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2479,35 +2480,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 račun?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 račun"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news račun?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Obriši news račun"
 
@@ -2523,7 +2524,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Bez pošiljatelja)"
 
@@ -3908,7 +3909,7 @@ msgstr "Pronađi u trenutnoj poruci"
 msgid "Find text:"
 msgstr "Pronađi tekst:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Osjetljiv na velika/mala slova"
 
@@ -5779,25 +5780,25 @@ msgstr "Ime zaglavlja nije postavljeno."
 msgid "Destination folder is not specified."
 msgstr "Destinacija nije postavljena."
 
-#: src/prefs_filter_edit.c:1791
+#: src/prefs_filter_edit.c:1795
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1818
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Nije upisan primatelj."
 
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: datoteka ne postoji\n"
@@ -5851,19 +5852,19 @@ msgid "Attachment"
 msgstr "Prilog"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Datum"
@@ -6261,7 +6262,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:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Gotovo."
 
@@ -6270,60 +6271,60 @@ msgstr "Gotovo."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d news grupa primljeno (%s pročitano)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 #, fuzzy
 msgid "Search messages"
 msgstr "/_Traži poruka..."
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Automatski postavi slijedeće adrese"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Spis"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Traži spis"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Traži spis"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Traži spis"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 #, fuzzy
 msgid "Location:"
 msgstr "Citat"
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Ime datoteke"
@@ -6683,35 +6684,35 @@ msgstr "Kreiram pregled teksta...\n"
 msgid "This message can't be displayed.\n"
 msgstr "poruka neće biti primljena\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_premi kao"
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Kreiranje nove pošte"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr ""
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6720,7 +6721,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/hu.po b/po/hu.po
index 4c7a2dd8..32bae05c 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2005-12-27 11:05+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
@@ -1051,7 +1051,7 @@ msgstr ""
 "Tényleg törölni szeretné a(z) `%s' mappát ÉS az összes címet benne?\n"
 "Ha csak a mappát törli, a címek átkerülnek a szülő mappába."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
@@ -1181,7 +1181,7 @@ msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Mappa"
 
@@ -1574,7 +1574,7 @@ msgstr "Üzenet: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Egy több részes üzenet egy darabja nem hozzáférhető."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
@@ -2209,7 +2209,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehető a mappanévbe."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa már létezik."
@@ -2366,19 +2366,20 @@ msgid "Can't move the folder `%s'."
 msgstr "`%s' mappa nem helyezhető át."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Tényleg eltávolítja `%s' postaládát?\n"
+"(Az üzenetek NEM törlődnek a meghajtóról)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Mappa törlése"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2391,20 +2392,20 @@ msgstr ""
 "\n"
 "Biztosan törölni szeretné?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' nem távolítható el."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 msgid "Delete all messages in the trash folder?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2413,34 +2414,34 @@ msgstr ""
 "Tényleg eltávolítja `%s' postaládát?\n"
 "(Az üzenetek NEM törlődnek a meghajtóról)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Tényleg törli a(z) `%s' IMAP4 hozzáférést?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hozzáférés törlése"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírcsoportot?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Hírcsoport törlése"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírhozzáférést?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Hírhozzáférés törlése"
 
@@ -2456,7 +2457,7 @@ msgstr "Tárgy:"
 msgid "Creating header view...\n"
 msgstr "Fejléc nézet létrehozása...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Nincs Feladó)"
 
@@ -3728,7 +3729,7 @@ msgstr "Keresés az aktuális üzenetben"
 msgid "Find text:"
 msgstr "Szöveg keresése:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Nagy- és kisbetű érzékenység"
 
@@ -5548,23 +5549,23 @@ msgstr "Nincs mgadva parancs."
 msgid "Destination folder is not specified."
 msgstr "Nincs megadva célmappa."
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "Nincs megadva szabálynév."
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "Érvénytelen feltétel."
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "Nincs megadva szabálynév."
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "Érvénytelen művelet."
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "Nem létező feltétel."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "Nem létező művelet."
 
@@ -5614,19 +5615,19 @@ msgid "Attachment"
 msgstr "Csatolás"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Dátum"
@@ -6019,7 +6020,7 @@ msgstr "Hírcsoport lista letöltése..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nem lehet olvasni a hírcsoportok listáját."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Kész."
 
@@ -6028,53 +6029,53 @@ msgstr "Kész."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d hírcsoport letöltve (%s olvasott)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Üzenetek keresése"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "Néhány egyezik a következőkből"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "Minden egyezik a következőkből"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 msgid "Folder:"
 msgstr "Mappa:"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 msgid "Search subfolders"
 msgstr "Almappák keresése"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 msgid "_Save as search folder"
 msgstr "_Mentés, mint keresési mappa"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, c-format
 msgid "Searching %s ..."
 msgstr "%s keresése..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "%s keresése (%d / %d)..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 msgid "Save as search folder"
 msgstr "Mentés, mint keresési mappa"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr "Hely:"
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 msgid "Folder name:"
 msgstr "Mappanév:"
 
@@ -6415,31 +6416,31 @@ msgstr "Szövegnézet létrehozása...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Ez az üzenet nem jeleníthető meg.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "A kép me_ntése mint..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 msgid "Compose _new message"
 msgstr "Ú_j üzenet szerkesztése"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 msgid "Add to address _book..."
 msgstr "Hozzáadás a _címjegyzékhez..."
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 msgid "Copy this add_ress"
 msgstr "A cí_m másolása"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr "M_egnyitás webböngészővel"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "A _hivatkozás másolása"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6451,6 +6452,6 @@ msgstr ""
 "látható URL-től (%s).\n"
 "Ennek ellenére megnyitja?"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr "Hamis URL figyelmeztetés"
diff --git a/po/it.po b/po/it.po
index fd58e7ce..b0bb6b04 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2005-12-15 19:09+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -1051,7 +1051,7 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
@@ -1185,7 +1185,7 @@ msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Cartella"
 
@@ -1578,7 +1578,7 @@ msgstr "Messaggio: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
@@ -2218,7 +2218,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "«%c» non può essere incluso nel nome della cartella."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella «%s» esiste già."
@@ -2375,19 +2375,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Impossibile spostare la cartella «%s»."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Rimuovere la casella postale «%s» ?\n"
+"(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Elimina la cartella"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2401,20 +2402,20 @@ msgstr ""
 "\n"
 "Eliminare?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 msgid "Delete all messages in the trash folder?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2423,34 +2424,34 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 «%s»?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup «%s» ?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news «%s» ?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
@@ -2466,7 +2467,7 @@ msgstr "Oggetto:"
 msgid "Creating header view...\n"
 msgstr "Creazione della vista dell'intestazione...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Nessun mittente)"
 
@@ -3739,7 +3740,7 @@ msgstr "Trova nel messaggio attuale"
 msgid "Find text:"
 msgstr "Testo da trovare:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Maiuscole/minuscole"
 
@@ -5563,23 +5564,23 @@ msgstr "Il comando non è specificato."
 msgid "Destination folder is not specified."
 msgstr "La cartella di destinazione non è specificata."
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "Il nome della regola non è specificato."
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "Esiste una condizione non valida."
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "Il nome della regola non è specificato."
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "Esiste un'azione non valida."
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "La condizione non esiste."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "L'azione non esiste."
 
@@ -5629,19 +5630,19 @@ msgid "Attachment"
 msgstr "Allegato"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Data"
@@ -6035,7 +6036,7 @@ msgstr "Recupero la lista dei newsgroup..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossibile recuperare la lista dei newsgroup."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Fatto."
 
@@ -6044,57 +6045,57 @@ msgstr "Fatto."
 msgid "%d newsgroups received (%s read)"
 msgstr "ricevuti %d newsgroup (%s letti)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Ricerca dei messaggi"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "Corrisponde a qualcuno dei seguenti"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "Corrisponde a tutti i seguenti"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Cartella"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Ricerca fallita"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Salva nella cartella «Bozze»"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Analisi della cartella %s..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Salva nella cartella «Bozze»"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Nome del file"
@@ -6438,31 +6439,31 @@ msgstr "Creazione della vista del testo...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Questo messaggio non può essere visualizzato.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "Sa_lva questa immagine come..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 msgid "Compose _new message"
 msgstr "Componi un _nuovo messaggio"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 msgid "Add to address _book..."
 msgstr "Aggiungi alla ru_brica..."
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 msgid "Copy this add_ress"
 msgstr "Copia questo indi_rizzo"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr "Apri c_on il browser web"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "Copia questo _link"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6475,7 +6476,7 @@ msgstr ""
 "\n"
 "Aprirlo comunque?"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr "Avvertimento falsificazione URL"
 
diff --git a/po/ja.po b/po/ja.po
index 785c9377..35b3473e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 1999-10-12\n"
 "Last-Translator: Hiroyuki Yamamoto <hiro-y@kcn.ne.jp>\n"
 "Language-Team: Japanese <ja@li.org>\n"
@@ -1047,7 +1047,7 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
@@ -1179,7 +1179,7 @@ msgstr "グループ"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "フォルダ"
 
@@ -1572,7 +1572,7 @@ msgstr "メッセージ: %s"
 msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(件名なし)"
@@ -2206,7 +2206,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "フォルダ名に `%c' を含むことはできません。"
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "フォルダ `%s' はすでに存在します。"
@@ -2365,19 +2365,17 @@ msgstr "フォルダ `%s' を移動できません。"
 #: src/folderview.c:2297
 #, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
-"検索フォルダ '%s' は削除されます。\n"
-"実際のメッセージは削除されません。\n"
-"本当に削除しますか?"
+"検索フォルダ '%s' を削除しますか?\n"
+"実際のメッセージは削除されません。"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 msgid "Delete search folder"
 msgstr "検索フォルダの削除"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2390,20 +2388,20 @@ msgstr ""
 "\n"
 "本当に削除してもいいですか?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "フォルダ '%s' を削除できません。"
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "ごみ箱を空にする"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 msgid "Delete all messages in the trash folder?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2412,34 +2410,34 @@ msgstr ""
 "本当にメールボックス `%s' を削除しますか?\n"
 "(メッセージはディスクからは削除されません)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "メールボックスの削除"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "本当にIMAP4アカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "IMAP4アカウントの削除"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "本当にニュースグループ `%s' を削除しますか?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "ニュースグループの削除"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "本当にニュースアカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "ニュースアカウントの削除"
 
@@ -2455,7 +2453,7 @@ msgstr "件名:"
 msgid "Creating header view...\n"
 msgstr "ヘッダビューを作成中...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(差出人不明)"
 
@@ -3724,7 +3722,7 @@ msgstr "現在のメッセージ内を検索"
 msgid "Find text:"
 msgstr "検索文字列:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "大文字/小文字を区別"
 
@@ -5536,23 +5534,23 @@ msgstr "コマンドが指定されていません。"
 msgid "Destination folder is not specified."
 msgstr "移動先のフォルダが指定されていません。"
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "ルール名が指定されていません。"
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "無効な条件が存在します。"
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "ルール名が指定されていません。"
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "無効なアクションが存在します。"
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "条件が存在しません。"
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "アクションが存在しません。"
 
@@ -5602,19 +5600,19 @@ msgid "Attachment"
 msgstr "添付"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "件名"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "差出人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "日付"
@@ -6007,7 +6005,7 @@ msgstr "ニュースグループリストを取得中..."
 msgid "Can't retrieve newsgroup list."
 msgstr "ニュースグループリストを取得できません。"
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "完了."
 
@@ -6016,53 +6014,53 @@ msgstr "完了."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d ニュースグループを受信 (%s 受信)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "メッセージを検索"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "次の条件のいずれかが該当"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "次の条件のすべてが該当"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 msgid "Folder:"
 msgstr "フォルダ:"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 msgid "Search subfolders"
 msgstr "サブフォルダも検索"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 msgid "_Save as search folder"
 msgstr "検索フォルダとして保存(_S)"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, c-format
 msgid "Searching %s ..."
 msgstr "%s を検索中..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "%s を検索中 (%d / %d)..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(日付なし)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 msgid "Save as search folder"
 msgstr "検索フォルダとして保存"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr "場所:"
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 msgid "Folder name:"
 msgstr "フォルダ名:"
 
@@ -6403,31 +6401,31 @@ msgstr "テキストビューを作成中...\n"
 msgid "This message can't be displayed.\n"
 msgstr "このメッセージは表示できません。\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "画像を保存(_V)..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 msgid "Compose _new message"
 msgstr "新規メッセージを作成(_N)"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 msgid "Add to address _book..."
 msgstr "アドレス帳に追加(_B)..."
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 msgid "Copy this add_ress"
 msgstr "アドレスをコピー(_R)"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr "Webブラウザで開く(_O)"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "リンクをコピー(_L)"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6440,6 +6438,6 @@ msgstr ""
 "\n"
 "とにかく開きますか?"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr "偽装URLの警告"
diff --git a/po/ko.po b/po/ko.po
index 58c7516a..bdae8a3e 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2002-12-02 11:09+0900\n"
 "Last-Translator: Nam SungHyun <namsh@kldp.org>\n"
 "Language-Team: Korean <gnome-kr-translation@lists.sourceforge.net>\n"
@@ -1039,7 +1039,7 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
@@ -1168,7 +1168,7 @@ msgstr "그룹"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "폴더"
 
@@ -1596,7 +1596,7 @@ msgstr "메시지: %s"
 msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(제목 없음)"
@@ -2237,7 +2237,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c'는 폴더 이름에 포함될 수 없습니다."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' 폴더가 이미 존재합니다."
@@ -2399,19 +2399,20 @@ msgid "Can't move the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
+"(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "폴더 삭제"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2422,21 +2423,21 @@ msgstr ""
 "`%s'아래에 있는 모든 폴더와 메시지가 삭제될 것입니다.\n"
 "정말로 삭제하시겠습니까?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2445,34 +2446,34 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "정말로 `%s' IMAP4 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 계정 삭제"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "정말로 `%s' 뉴스그룹을 삭제하시겠습니까?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "뉴스그룹 삭제"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "정말로 `%s' 뉴스그룹 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "뉴스그룹 계정 삭제"
 
@@ -2488,7 +2489,7 @@ msgstr "제목:"
 msgid "Creating header view...\n"
 msgstr "헤더 뷰를 생성합니다...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(???)"
 
@@ -3785,7 +3786,7 @@ msgstr "현재 메시지에서 찾기"
 msgid "Find text:"
 msgstr "찾을 문자열:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "대소 문자 구별"
 
@@ -5636,25 +5637,25 @@ msgstr "명령이 지정되지않음"
 msgid "Destination folder is not specified."
 msgstr "저장 폴더가 설정이 되어있지않습니다"
 
-#: src/prefs_filter_edit.c:1791
+#: src/prefs_filter_edit.c:1795
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1818
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "받는 사람이 지정되지않았습니다"
 
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "명령이 지정되지않음"
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: 파일이 없습니다\n"
@@ -5707,19 +5708,19 @@ msgid "Attachment"
 msgstr "첨부"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "날짜"
@@ -6109,7 +6110,7 @@ msgstr "뉴스그룹 목록을 얻을 수가 없습니다."
 msgid "Can't retrieve newsgroup list."
 msgstr "뉴스그룹 목록을 얻을 수가 없습니다."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "완료."
 
@@ -6118,58 +6119,58 @@ msgstr "완료."
 msgid "%d newsgroups received (%s read)"
 msgstr ""
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "메시지 찾기"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "폴더"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "찾기 실패"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "필터링..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(날짜 없슴)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "임시 보관함에 넣기"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "파일 이름"
@@ -6516,36 +6517,36 @@ msgstr "텍스트 뷰를 생성합니다...\n"
 msgid "This message can't be displayed.\n"
 msgstr "이 메시지를 받지않을 것입니다\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/새 이름으로(_S)..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "새 메시지를 작성합니다"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/주소록에 보낸이 추가(_k)"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "공용 주소록"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "웹 탐색기"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6554,7 +6555,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/lt.po b/po/lt.po
index 57a8e025..4d34ef9a 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2005-06-09 13:51+0300\n"
 "Last-Translator: Vitalijus Valantiejus <vitalijus@users.sf.net>\n"
 "Language-Team: Lithuanian <komp_lt@konferencijos.lt>\n"
@@ -1047,7 +1047,7 @@ msgstr ""
 "Ar tikrai norite pašalinti katalogą „%s“ ir visus adresus jame? \n"
 "Jei pašalinsite tik katalogą, adresai bus perkelti į aukštesnįjį katalogą."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
@@ -1176,7 +1176,7 @@ msgstr "Grupė"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Katalogas"
 
@@ -1571,7 +1571,7 @@ msgstr "Žinutė: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės žinutės dalies"
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
@@ -2207,7 +2207,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "„%c“ negali būti katalogo pavadinime."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalogas „%s“ egzistuoja."
@@ -2365,19 +2365,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Negaliu perkelti katalogo „%s“"
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Ar tikrai pašalinti dėžutę „%s“ ?\n"
+"(žinutės NEBUS ištrintos iš disko)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ištrinti katalogą"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2390,21 +2391,21 @@ msgstr ""
 "\n"
 "Ar tikrai norite ištrinti?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Negaliu pašalinti katalogo „%s“"
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Ištrinti visas žinutes šiukšlinėje?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2413,34 +2414,34 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(žinutės NEBUS ištrintos iš disko)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ar tikrai ištrinti IMAP4 sąskaitą „%s“?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Ištrinti IMAP4 sąskaitą"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ar tikrai ištrinti naujienų grupę „%s“?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Ištrinti naujienų grupę"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ar tikrai pašalinti naujienų sąskaitą „%s“?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Pašalinti naujienų sąskaitą"
 
@@ -2456,7 +2457,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Sukuria antraščių peržiūra...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Nėra gavėjo)"
 
@@ -3731,7 +3732,7 @@ msgstr "Rasti žinutėje"
 msgid "Find text:"
 msgstr "Rasti tekstą:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Skirti didžiąsias-mažąsias raides"
 
@@ -5557,23 +5558,23 @@ msgstr "Nenurodyta komanda."
 msgid "Destination folder is not specified."
 msgstr "Nenurodytas katalogas."
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "Nenurodytas taisyklės pavadinimas."
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "Egzistuoja neteisinga sąlyga."
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "Nenurodytas taisyklės pavadinimas."
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "Neteisingas veiksmas"
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "Sąlyga neegzistuoja."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "Veiksmas neegzistuoja."
 
@@ -5624,19 +5625,19 @@ msgid "Attachment"
 msgstr "Priedas"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Data"
@@ -6032,7 +6033,7 @@ msgstr "Negaliu gauti naujienų grupių sąrašo."
 msgid "Can't retrieve newsgroup list."
 msgstr "Negaliu gauti naujienų grupių sąrašo."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Atlikta."
 
@@ -6041,57 +6042,57 @@ msgstr "Atlikta."
 msgid "%d newsgroups received (%s read)"
 msgstr "Gauta naujienų grupių: %d (%s skaityta)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Ieškoti žinučių"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "Jei teisingas bet kuris"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "Jei teisingi visi"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Katalogas"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Paieška nepavyko"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Išsaugoti į juodraščių katalogą"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtruojama..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Be datos)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Išsaugoti į juodraščių katalogą"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Bylos vardas"
@@ -6438,31 +6439,31 @@ msgstr "Sukuriama teksto peržiūra...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Žinutė negali būti parodyta.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "Saugoti pa_veikslėlį kaip"
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 msgid "Compose _new message"
 msgstr "Rašyti _naują laišką"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 msgid "Add to address _book..."
 msgstr "Pridėti į adresų _knygą"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 msgid "Copy this add_ress"
 msgstr "Kopijuoti ad_resą"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr "_Atverti su naršykle"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "Kopijuoti _nuorodą"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6475,7 +6476,7 @@ msgstr ""
 "\n"
 "Visvien atverti?"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr "Perspėjimas dėl netikro URL"
 
diff --git a/po/nl.po b/po/nl.po
index de710630..b1284977 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2003-02-18 13:03--100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -1060,7 +1060,7 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Verwijder map"
 
@@ -1194,7 +1194,7 @@ msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Accounts"
 
@@ -1621,7 +1621,7 @@ msgstr "Bericht: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
@@ -2264,7 +2264,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
@@ -2426,19 +2426,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Wilt u de '%s' mailbox werkelijk verwijderen?\n"
+"(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Verwijder map"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2449,21 +2450,21 @@ msgstr ""
 "Alle mappen en berichten in '%s' zullen worden verwijderd.\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2472,34 +2473,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
@@ -2515,7 +2516,7 @@ msgstr "Onderwerp:"
 msgid "Creating header view...\n"
 msgstr "Header view wordt aangemaakt...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
@@ -3816,7 +3817,7 @@ msgstr "Zoek in huidig bericht"
 msgid "Find text:"
 msgstr "Zoek naar:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Hoofdlettergevoelig"
 
@@ -5696,25 +5697,25 @@ msgstr "Opdrachtregel is niet ingesteld."
 msgid "Destination folder is not specified."
 msgstr "Er is geen map gekozen om het heen te verplaatsen."
 
-#: src/prefs_filter_edit.c:1791
+#: src/prefs_filter_edit.c:1795
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1818
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Ontvanger is niet gespecificeerd."
 
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Opdrachtregel is niet ingesteld."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: bestand bestaat niet\n"
@@ -5769,19 +5770,19 @@ msgid "Attachment"
 msgstr "Bijvoeging"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Datum"
@@ -6175,7 +6176,7 @@ msgstr "Kan geen nieuwsgroep opvragen."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan geen nieuwsgroep opvragen."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Klaar."
 
@@ -6184,58 +6185,58 @@ msgstr "Klaar."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d nieuwsgroepen ontvangen (%s ingelezen)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Berichten doorzoeken"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Accounts"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Zoeken mislukt"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Opslaan als klad"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Bezig met filteren..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Opslaan als klad"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Bestandsnaam"
@@ -6583,36 +6584,36 @@ msgstr "Tekstvenster wordt aangemaakt...\n"
 msgid "This message can't be displayed.\n"
 msgstr "een bericht wordt niet ontvangen\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Opslaan als..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Nieuw bericht opstellen"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Afz_ender toevoegen aan adresboek"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Algemene adressen"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webbrowser"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6621,7 +6622,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/pl.po b/po/pl.po
index 8aed8876..faba4c45 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2005-03-05 18:57+0100\n"
 "Last-Translator: Wit Wilinski <madman at linux dot bydg dot org>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -1045,7 +1045,7 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
@@ -1181,7 +1181,7 @@ msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Katalog"
 
@@ -1576,7 +1576,7 @@ msgstr "Wiadomość: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
@@ -2214,7 +2214,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie może wystąpić w nazwie katalogu."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' już istnieje."
@@ -2373,19 +2373,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
+"(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Usuń katalog"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2396,21 +2397,21 @@ msgstr ""
 "Wszystkie katalogi i wiadomości w \"%s\" zostaną usunięte.\n"
 "Czy naprawdę chcesz je usunąć?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2419,34 +2420,34 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Usuń konto IMAP4"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawdę chcesz usunąć grupę dyskusyjną \"%s\"?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Usuń grupę dyskusyjną"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Usuń konto grup dyskusyjnych"
 
@@ -2462,7 +2463,7 @@ msgstr "Temat:"
 msgid "Creating header view...\n"
 msgstr "Tworzenie widoku nagłówków...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Bez Od)"
 
@@ -3734,7 +3735,7 @@ msgstr "Znajdź w bieżącej wiadomości"
 msgid "Find text:"
 msgstr "Znajdź tekst:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Rozróżnianie wielkości liter"
 
@@ -5572,24 +5573,24 @@ msgstr "Nie ustawiono polecenia."
 msgid "Destination folder is not specified."
 msgstr "Nie został wybrany katalog docelowy."
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "Nie podano nazwy regułki."
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "Nie podano nazwy regułki."
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Nie ustawiono polecenia."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "Akcja nie istnieje."
 
@@ -5640,19 +5641,19 @@ msgid "Attachment"
 msgstr "Załącznik"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Data"
@@ -6044,7 +6045,7 @@ msgstr "Nie można pobrać listy grup dyskusyjnych."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nie można pobrać listy grup dyskusyjnych."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Gotowe."
 
@@ -6053,58 +6054,58 @@ msgstr "Gotowe."
 msgid "%d newsgroups received (%s read)"
 msgstr "pobrano %d grup dyskusyjnych (%s przeczytano)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Wyszukaj wiadomości"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Dopasuj wszystkie"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Katalog"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Błąd wyszukiwania"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Bez daty)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Zapisz w katalogu szablonów"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Nazwa pliku"
@@ -6469,35 +6470,35 @@ msgstr "Tworzenie widoku tekstowego...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Ta wiadomość nie może zostać wyświetlona.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "Zapi_sz grafikę jako..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Utwórz nową wiadomość"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dodaj nadawcę do _książki adresowej"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Przeglądarka Web"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "Kopiuj ten _link"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6506,7 +6507,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9db716c6..14a6a13a 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,10 +6,13 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2006-01-05 09:40-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
-"Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías V. Prestes <isix@uol.com.br> André Luís Lopes <andrelop@ig.com.br> Debian-BR <debian-l10n-portuguese@lists.debian.org> Gustavo Noronha Silva <kov@debian.org>\n"
+"Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías "
+"V. Prestes <isix@uol.com.br> André Luís Lopes <andrelop@ig.com.br> Debian-BR "
+"<debian-l10n-portuguese@lists.debian.org> Gustavo Noronha Silva <kov@debian."
+"org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -23,8 +26,7 @@ msgstr "Lendo as configurações de cada conta...\n"
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP4 com %s terminou. Reconectando...\n"
 
-#: libsylph/imap.c:515
-#: libsylph/imap.c:521
+#: libsylph/imap.c:515 libsylph/imap.c:521
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "servidor IMAP4 desabilita LOGIN.\n"
 
@@ -67,8 +69,7 @@ msgstr "Removendo mensagens %s"
 msgid "can't set deleted flags: %s\n"
 msgstr "não posso marcar como apagado: %s\n"
 
-#: libsylph/imap.c:1487
-#: libsylph/imap.c:1582
+#: libsylph/imap.c:1487 libsylph/imap.c:1582
 msgid "can't expunge\n"
 msgstr "não posso eliminar\n"
 
@@ -90,8 +91,7 @@ msgstr "não posso fechar pasta\n"
 msgid "root folder %s not exist\n"
 msgstr "pasta raiz %s inexistente\n"
 
-#: libsylph/imap.c:1883
-#: libsylph/imap.c:1891
+#: libsylph/imap.c:1883 libsylph/imap.c:1891
 msgid "error occurred while getting LIST.\n"
 msgstr "erro recebendo resultados do LIST.\n"
 
@@ -213,8 +213,7 @@ msgstr "o iconv não pode converter UTF-7 para %s\n"
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "o iconv não pode converter %s para UTF-7\n"
 
-#: libsylph/mbox.c:50
-#: libsylph/mbox.c:196
+#: libsylph/mbox.c:50 libsylph/mbox.c:196
 msgid "can't write to temporary file\n"
 msgstr "não é possível gravar no arquivo temporário\n"
 
@@ -278,8 +277,7 @@ msgstr "o correio está sendo usado por outro processo, aguardando...\n"
 msgid "can't lock %s\n"
 msgstr "não foi possível travar %s\n"
 
-#: libsylph/mbox.c:323
-#: libsylph/mbox.c:373
+#: libsylph/mbox.c:323 libsylph/mbox.c:373
 msgid "invalid lock type\n"
 msgstr "tipo de trava inválido\n"
 
@@ -302,13 +300,11 @@ msgstr "Exportando mensagens de %s em %s...\n"
 msgid "can't copy message %s to %s\n"
 msgstr "não foi possível copiar a mensagem %s para %s\n"
 
-#: libsylph/mh.c:496
-#: libsylph/mh.c:619
+#: libsylph/mh.c:496 libsylph/mh.c:619
 msgid "Can't open mark file.\n"
 msgstr "Não foi possível abrir o arquivo de marcas.\n"
 
-#: libsylph/mh.c:503
-#: libsylph/mh.c:625
+#: libsylph/mh.c:503 libsylph/mh.c:625
 msgid "the src folder is identical to the dest.\n"
 msgstr "pastas de origem e destino são idênticas.\n"
 
@@ -322,9 +318,7 @@ msgstr "Copiando mensagem %s%c%d para %s ...\n"
 msgid "Last number in dir %s = %d\n"
 msgstr "Último número no diretório %s = %d\n"
 
-#: libsylph/mh.c:842
-#: libsylph/mh.c:855
-#: src/main.c:146
+#: libsylph/mh.c:842 libsylph/mh.c:855 src/main.c:146
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -422,13 +416,11 @@ msgstr "ocorreu um erro ao obter xover.\n"
 msgid "invalid xover line: %s\n"
 msgstr "linha xover inválida: %s\n"
 
-#: libsylph/news.c:855
-#: libsylph/news.c:887
+#: libsylph/news.c:855 libsylph/news.c:887
 msgid "can't get xhdr\n"
 msgstr "não foi possível obter xover\n"
 
-#: libsylph/news.c:867
-#: libsylph/news.c:899
+#: libsylph/news.c:867 libsylph/news.c:899
 msgid "error occurred while getting xhdr.\n"
 msgstr "ocorreu um erro ao obter xover.\n"
 
@@ -437,14 +429,12 @@ msgstr "ocorreu um erro ao obter xover.\n"
 msgid "Can't connect to NNTP server: %s:%d\n"
 msgstr "Não foi possível se conectar com o servidor NNTP: %s:%d\n"
 
-#: libsylph/nntp.c:164
-#: libsylph/nntp.c:227
+#: libsylph/nntp.c:164 libsylph/nntp.c:227
 #, c-format
 msgid "protocol error: %s\n"
 msgstr "erro do protocolo: %s\n"
 
-#: libsylph/nntp.c:187
-#: libsylph/nntp.c:233
+#: libsylph/nntp.c:187 libsylph/nntp.c:233
 msgid "protocol error\n"
 msgstr "erro do protocolo\n"
 
@@ -464,8 +454,7 @@ msgstr "Timestamp APOP requerida não encontrada no greeting\n"
 msgid "Timestamp syntax error in greeting\n"
 msgstr "Erro de sintaxe no greeting\n"
 
-#: libsylph/pop.c:191
-#: libsylph/pop.c:218
+#: libsylph/pop.c:191 libsylph/pop.c:218
 msgid "POP3 protocol error\n"
 msgstr "Erro do protocolo POP3\n"
 
@@ -492,13 +481,11 @@ msgstr "a caixa de correio está travada\n"
 msgid "session timeout\n"
 msgstr "tempo limite da sessão\n"
 
-#: libsylph/pop.c:665
-#: libsylph/smtp.c:561
+#: libsylph/pop.c:665 libsylph/smtp.c:561
 msgid "can't start TLS session\n"
 msgstr "não foi possível iniciar sessão TLS\n"
 
-#: libsylph/pop.c:672
-#: libsylph/smtp.c:496
+#: libsylph/pop.c:672 libsylph/smtp.c:496
 msgid "error occurred on authentication\n"
 msgstr "ocorreu um erro na autenticação\n"
 
@@ -510,13 +497,9 @@ msgstr "comando não suportado\n"
 msgid "error occurred on POP3 session\n"
 msgstr "Erro na sessão POP3\n"
 
-#: libsylph/prefs.c:196
-#: libsylph/prefs.c:224
-#: libsylph/prefs.c:269
-#: libsylph/prefs_account.c:215
-#: libsylph/prefs_account.c:229
-#: src/prefs_display_header.c:413
-#: src/prefs_display_header.c:438
+#: libsylph/prefs.c:196 libsylph/prefs.c:224 libsylph/prefs.c:269
+#: libsylph/prefs_account.c:215 libsylph/prefs_account.c:229
+#: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
 msgstr "falhou ao gravar a configuração no arquivo\n"
 
@@ -555,9 +538,7 @@ msgstr "O comando de impressão é inválido: `%s'\n"
 msgid "error occurred while retrieving data.\n"
 msgstr "ocorreu um erro enquanto os dados eram obtidos.\n"
 
-#: libsylph/recv.c:182
-#: libsylph/recv.c:214
-#: libsylph/recv.c:229
+#: libsylph/recv.c:182 libsylph/recv.c:214 libsylph/recv.c:229
 msgid "Can't write to file.\n"
 msgstr "Não foi possível gravar no arquivo.\n"
 
@@ -565,14 +546,11 @@ msgstr "Não foi possível gravar no arquivo.\n"
 msgid "SMTP AUTH not available\n"
 msgstr "SMTP AUTH não disponível\n"
 
-#: libsylph/smtp.c:466
-#: libsylph/smtp.c:516
+#: libsylph/smtp.c:466 libsylph/smtp.c:516
 msgid "bad SMTP response\n"
 msgstr "resposta SMTP inválida\n"
 
-#: libsylph/smtp.c:487
-#: libsylph/smtp.c:505
-#: libsylph/smtp.c:602
+#: libsylph/smtp.c:487 libsylph/smtp.c:505 libsylph/smtp.c:602
 msgid "error occurred on SMTP session\n"
 msgstr "erro na sessão SMTP\n"
 
@@ -592,8 +570,7 @@ msgstr "TLSv1 não disponível\n"
 msgid "TLSv1 available\n"
 msgstr "TLSv1 disponível\n"
 
-#: libsylph/ssl.c:101
-#: libsylph/ssl.c:108
+#: libsylph/ssl.c:101 libsylph/ssl.c:108
 msgid "SSL method not available\n"
 msgstr "método SSL não disponível\n"
 
@@ -650,16 +627,12 @@ msgstr "%.2fMB"
 msgid "%.2fGB"
 msgstr "%.2fGB"
 
-#: libsylph/utils.c:2373
-#: src/compose.c:2840
-#: src/compose.c:3103
-#: src/compose.c:3166
-#: src/compose.c:3286
+#: libsylph/utils.c:2373 src/compose.c:2840 src/compose.c:3103
+#: src/compose.c:3166 src/compose.c:3286
 msgid "can't change file mode\n"
 msgstr "não foi possível modificar as permissões do arquivo\n"
 
-#: libsylph/utils.c:2380
-#: libsylph/utils.c:2504
+#: libsylph/utils.c:2380 libsylph/utils.c:2504
 #, c-format
 msgid "writing to %s failed.\n"
 msgstr "erro ao gravar em %s.\n"
@@ -676,7 +649,10 @@ msgstr "GPGME é copyright 2001 por Werner Koch <dd9jn@gnu.org>\n"
 
 #: src/about.c:227
 msgid ""
-"This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2, or (at your option) any later version.\n"
+"This program is free software; you can redistribute it and/or modify it "
+"under the terms of the GNU General Public License as published by the Free "
+"Software Foundation; either version 2, or (at your option) any later "
+"version.\n"
 "\n"
 msgstr ""
 "Este programa é software livre; pode redistribuí-lo ou modificá-lo \n"
@@ -687,7 +663,10 @@ msgstr ""
 
 #: src/about.c:233
 msgid ""
-"This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.\n"
+"This program is distributed in the hope that it will be useful, but WITHOUT "
+"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or "
+"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for "
+"more details.\n"
 "\n"
 msgstr ""
 "Este programa é distribuido com a esperança de que seja útil, mas SEM \n"
@@ -697,9 +676,13 @@ msgstr ""
 "\n"
 
 #: src/about.c:239
-msgid "You should have received a copy of the GNU General Public License along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
+msgid ""
+"You should have received a copy of the GNU General Public License along with "
+"this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
+"Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
-"Você deve ter recebido uma cópia da GNU General Public License junto com este \n"
+"Você deve ter recebido uma cópia da GNU General Public License junto com "
+"este \n"
 "programa; caso não, escreva para a Free Software Foundation, Inc., \n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
@@ -707,7 +690,8 @@ msgstr ""
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
-msgstr "Por favor feche todas as janelas de composição antes de editar as contas."
+msgstr ""
+"Por favor feche todas as janelas de composição antes de editar as contas."
 
 #: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
@@ -729,27 +713,16 @@ msgstr ""
 "Mensagens novas serão baixadas nessa ordem. Marque as caixas\n"
 "na coluna `G' para habilitar essa caixa no `Baixar tudo'."
 
-#: src/account_dialog.c:366
-#: src/addressadd.c:192
-#: src/addressbook.c:491
-#: src/compose.c:4244
-#: 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:206
-#: src/prefs_filter.c:259
-#: src/prefs_folder_item.c:174
+#: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
+#: src/compose.c:4244 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:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nome"
 
-#: src/account_dialog.c:371
-#: src/prefs_account_dialog.c:655
+#: src/account_dialog.c:371 src/prefs_account_dialog.c:655
 msgid "Protocol"
 msgstr "Protocolo"
 
@@ -757,8 +730,7 @@ msgstr "Protocolo"
 msgid "Server"
 msgstr "Servidor"
 
-#: src/account_dialog.c:400
-#: src/prefs_filter.c:324
+#: src/account_dialog.c:400 src/prefs_filter.c:324
 msgid "Edit"
 msgstr "Editar"
 
@@ -771,8 +743,7 @@ msgstr " _Marcar como conta padrão "
 msgid "Do you really want to delete the account '%s'?"
 msgstr "Quer realmente apagar a conta '%s'?"
 
-#: src/account_dialog.c:489
-#: src/prefs_filter.c:688
+#: src/account_dialog.c:489 src/prefs_filter.c:688
 msgid "(Untitled)"
 msgstr "(Sem título)"
 
@@ -879,19 +850,13 @@ msgstr "Argumento do usuário para a ação"
 msgid "Add Address to Book"
 msgstr "Adicionar ao Catálogo de Endereços"
 
-#: src/addressadd.c:202
-#: src/compose.c:4744
-#: src/editaddress.c:201
+#: src/addressadd.c:202 src/compose.c:4744 src/editaddress.c:201
 #: src/select-keys.c:320
 msgid "Address"
 msgstr "Endereço"
 
-#: src/addressadd.c:212
-#: src/addressbook.c:493
-#: src/editaddress.c:202
-#: src/editaddress.c:795
-#: src/editaddress.c:860
-#: src/editgroup.c:267
+#: src/addressadd.c:212 src/addressbook.c:493 src/editaddress.c:202
+#: src/editaddress.c:795 src/editaddress.c:860 src/editgroup.c:267
 msgid "Remarks"
 msgstr "Notas"
 
@@ -899,9 +864,7 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione Pasta do Catálogo de Endereços"
 
-#: src/addressbook.c:336
-#: src/compose.c:514
-#: src/mainwindow.c:469
+#: src/addressbook.c:336 src/compose.c:514 src/mainwindow.c:469
 #: src/messageview.c:138
 msgid "/_File"
 msgstr "/_Arquivo"
@@ -922,17 +885,10 @@ msgstr "/_Arquivo/Novo _JPilot"
 msgid "/_File/New _Server"
 msgstr "/_Arquivo/Novo _Servidor"
 
-#: src/addressbook.c:345
-#: src/addressbook.c:348
-#: src/compose.c:519
-#: src/compose.c:524
-#: src/compose.c:528
-#: src/mainwindow.c:487
-#: src/mainwindow.c:490
-#: src/mainwindow.c:492
-#: src/mainwindow.c:495
-#: src/mainwindow.c:497
-#: src/messageview.c:141
+#: src/addressbook.c:345 src/addressbook.c:348 src/compose.c:519
+#: src/compose.c:524 src/compose.c:528 src/mainwindow.c:487
+#: src/mainwindow.c:490 src/mainwindow.c:492 src/mainwindow.c:495
+#: src/mainwindow.c:497 src/messageview.c:141
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
@@ -948,9 +904,7 @@ msgstr "/_Arquivo/_Apagar"
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:350
-#: src/compose.c:529
-#: src/messageview.c:142
+#: src/addressbook.c:350 src/compose.c:529 src/messageview.c:142
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
@@ -982,9 +936,7 @@ msgstr "/_Endereço/_Editar"
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/_Apagar"
 
-#: src/addressbook.c:358
-#: src/compose.c:636
-#: src/mainwindow.c:727
+#: src/addressbook.c:358 src/compose.c:636 src/mainwindow.c:727
 #: src/messageview.c:259
 msgid "/_Tools"
 msgstr "/_Ferramentas"
@@ -993,69 +945,44 @@ msgstr "/_Ferramentas"
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:360
-#: src/compose.c:655
-#: src/mainwindow.c:777
+#: src/addressbook.c:360 src/compose.c:655 src/mainwindow.c:777
 #: src/messageview.c:277
 msgid "/_Help"
 msgstr "/_Ajuda"
 
-#: src/addressbook.c:361
-#: src/compose.c:656
-#: src/mainwindow.c:788
+#: src/addressbook.c:361 src/compose.c:656 src/mainwindow.c:788
 #: src/messageview.c:278
 msgid "/_Help/_About"
 msgstr "/_Ajuda/_Sobre"
 
-#: src/addressbook.c:380
-#: src/addressbook.c:390
+#: src/addressbook.c:380 src/addressbook.c:390
 msgid "/New _Address"
 msgstr "/Novo _Endereço"
 
-#: src/addressbook.c:381
-#: src/addressbook.c:391
+#: src/addressbook.c:381 src/addressbook.c:391
 msgid "/New _Group"
 msgstr "/Novo _Grupo"
 
-#: src/addressbook.c:382
-#: src/addressbook.c:392
+#: src/addressbook.c:382 src/addressbook.c:392
 msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
-#: src/addressbook.c:383
-#: src/addressbook.c:393
-#: src/compose.c:508
-#: src/folderview.c:245
-#: src/folderview.c:247
-#: src/folderview.c:252
-#: src/folderview.c:263
-#: src/folderview.c:265
-#: src/folderview.c:267
-#: src/folderview.c:272
-#: src/folderview.c:282
-#: src/folderview.c:284
-#: src/folderview.c:288
-#: src/summaryview.c:399
-#: src/summaryview.c:403
-#: src/summaryview.c:407
-#: src/summaryview.c:417
-#: src/summaryview.c:419
-#: src/summaryview.c:431
-#: src/summaryview.c:437
+#: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
+#: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
+#: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:384
-#: src/addressbook.c:394
-#: src/compose.c:531
-#: src/mainwindow.c:501
-#: src/messageview.c:144
+#: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:531
+#: src/mainwindow.c:501 src/messageview.c:144
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:385
-#: src/addressbook.c:395
-#: src/summaryview.c:406
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:406
 msgid "/_Delete"
 msgstr "/_Apagar"
 
@@ -1063,37 +990,25 @@ msgstr "/_Apagar"
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:496
-#: src/compose.c:4745
-#: src/prefs_common_dialog.c:2179
+#: src/addressbook.c:496 src/compose.c:4745 src/prefs_common_dialog.c:2179
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
-#: src/addressbook.c:596
-#: src/prefs_filter_edit.c:251
+#: src/addressbook.c:596 src/prefs_filter_edit.c:251
 msgid "Name:"
 msgstr "Nome:"
 
 #. Buttons
-#: src/addressbook.c:628
-#: src/addressbook.c:1680
-#: src/editaddress.c:884
-#: src/editaddress.c:1017
-#: src/mainwindow.c:2343
-#: src/prefs_actions.c:266
-#: src/prefs_display_header.c:279
-#: src/prefs_display_header.c:334
+#: src/addressbook.c:628 src/addressbook.c:1680 src/editaddress.c:884
+#: src/editaddress.c:1017 src/mainwindow.c:2343 src/prefs_actions.c:266
+#: src/prefs_display_header.c:279 src/prefs_display_header.c:334
 #: src/prefs_template.c:233
 msgid "Delete"
 msgstr "Apagar"
 
-#: src/addressbook.c:631
-#: src/editaddress.c:890
-#: src/editaddress.c:1023
-#: src/prefs_actions.c:254
-#: src/prefs_customheader.c:232
-#: src/prefs_display_header.c:273
-#: src/prefs_display_header.c:328
+#: src/addressbook.c:631 src/editaddress.c:890 src/editaddress.c:1023
+#: src/prefs_actions.c:254 src/prefs_customheader.c:232
+#: src/prefs_display_header.c:273 src/prefs_display_header.c:328
 #: src/prefs_filter_edit.c:1492
 msgid "Add"
 msgstr "Adicionar"
@@ -1102,21 +1017,16 @@ msgstr "Adicionar"
 msgid "Lookup"
 msgstr "Procurar"
 
-#: src/addressbook.c:646
-#: src/headerview.c:55
-#: src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:650
-#: src/prefs_folder_item.c:357
-#: src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654
-#: src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:368
 msgid "Bcc:"
 msgstr "Cco:"
 
@@ -1138,8 +1048,7 @@ msgstr ""
 "Você quer apagar a pasta E todos os endereços em `%s' ?\n"
 "Caso apague somente a pasta, os endereços serão movidos para a pasta pai."
 
-#: src/addressbook.c:1674
-#: src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
@@ -1156,18 +1065,15 @@ msgstr "Pasta e _endereços"
 msgid "Really delete `%s' ?"
 msgstr "Apagar realmente `%s' ?"
 
-#: src/addressbook.c:2365
-#: src/addressbook.c:2498
+#: src/addressbook.c:2365 src/addressbook.c:2498
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:2369
-#: src/addressbook.c:2502
+#: src/addressbook.c:2369 src/addressbook.c:2502
 msgid "New user, could not save address book files."
 msgstr "Novo usuário, não foi possível salvar arquivos de livro de endereços."
 
-#: src/addressbook.c:2379
-#: src/addressbook.c:2512
+#: src/addressbook.c:2379 src/addressbook.c:2512
 msgid "Old address book converted successfully."
 msgstr "Catálogo de endereços antigo convertido com sucesso."
 
@@ -1215,26 +1121,36 @@ msgstr "Conversão do catálogo de endereços"
 msgid "Addressbook Error"
 msgstr "Erro no Catálogo de Endereços"
 
-#: src/addressbook.c:2455
-#: src/addressbook.c:2555
+#: src/addressbook.c:2455 src/addressbook.c:2555
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice do endereço"
 
 #: src/addressbook.c:2517
 msgid "Old address book converted, could not save new address index file"
-msgstr "Catálogo de endereços antigo convertido, não foi possível salvar o arquivo de indíce do novo endereço"
+msgstr ""
+"Catálogo de endereços antigo convertido, não foi possível salvar o arquivo "
+"de indíce do novo endereço"
 
 #: src/addressbook.c:2531
-msgid "Could not convert address book, but created empty new address book files."
-msgstr "Não foi possível converter o catálogo de endereços, mas arquivos vazios para o catálogo de endereços foram criados."
+msgid ""
+"Could not convert address book, but created empty new address book files."
+msgstr ""
+"Não foi possível converter o catálogo de endereços, mas arquivos vazios para "
+"o catálogo de endereços foram criados."
 
 #: src/addressbook.c:2537
-msgid "Could not convert address book, could not create new address book files."
-msgstr "Não foi possível converter o catálogo de endereços, não foi possível criar arquivos novos para o catálogo de endereços."
+msgid ""
+"Could not convert address book, could not create new address book files."
+msgstr ""
+"Não foi possível converter o catálogo de endereços, não foi possível criar "
+"arquivos novos para o catálogo de endereços."
 
 #: src/addressbook.c:2543
-msgid "Could not convert address book and could not create new address book files."
-msgstr "Não foi possível converter o catálogo de endereços e não foi possível criar arquivos novos para o catálogo de endereços."
+msgid ""
+"Could not convert address book and could not create new address book files."
+msgstr ""
+"Não foi possível converter o catálogo de endereços e não foi possível criar "
+"arquivos novos para o catálogo de endereços."
 
 #: src/addressbook.c:2561
 msgid "Addressbook Conversion Error"
@@ -1244,13 +1160,11 @@ msgstr "Erro na conversão do catálogo de endereços"
 msgid "Addressbook Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:3072
-#: src/prefs_common_dialog.c:2036
+#: src/addressbook.c:3072 src/prefs_common_dialog.c:2036
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3088
-#: src/importldif.c:514
+#: src/addressbook.c:3088 src/importldif.c:514
 msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
@@ -1267,10 +1181,8 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152
-#: src/folderview.c:358
-#: src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Pasta"
 
@@ -1278,8 +1190,7 @@ msgstr "Pasta"
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3184
-#: src/addressbook.c:3200
+#: src/addressbook.c:3184 src/addressbook.c:3200
 msgid "JPilot"
 msgstr "JPilot"
 
@@ -1287,31 +1198,23 @@ msgstr "JPilot"
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
-#: src/addrindex.c:95
-#: src/addrindex.c:99
-#: src/addrindex.c:106
+#: src/addrindex.c:95 src/addrindex.c:99 src/addrindex.c:106
 msgid "Common address"
 msgstr "Endereços comuns"
 
-#: src/addrindex.c:96
-#: src/addrindex.c:100
-#: src/addrindex.c:107
+#: src/addrindex.c:96 src/addrindex.c:100 src/addrindex.c:107
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:141
-#: src/compose.c:5467
-#: src/main.c:572
+#: src/alertpanel.c:141 src/compose.c:5467 src/main.c:572
 msgid "Notice"
 msgstr "Notificação"
 
-#: src/alertpanel.c:154
-#: src/main.c:675
+#: src/alertpanel.c:154 src/main.c:675
 msgid "Warning"
 msgstr "Aviso"
 
-#: src/alertpanel.c:167
-#: src/inc.c:586
+#: src/alertpanel.c:167 src/inc.c:586
 msgid "Error"
 msgstr "Erro"
 
@@ -1354,9 +1257,7 @@ msgstr "Marrom"
 #. 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:280
-#: src/prefs_folder_item.c:317
-#: src/summaryview.c:4427
+#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4427
 msgid "None"
 msgstr "Nenhuma"
 
@@ -1368,9 +1269,7 @@ msgstr "/_Adicionar"
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:509
-#: src/folderview.c:254
-#: src/folderview.c:274
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
 #: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
@@ -1411,9 +1310,7 @@ msgstr "/_Editar/_Desfazer"
 msgid "/_Edit/_Redo"
 msgstr "/_Editar/_Refazer"
 
-#: src/compose.c:534
-#: src/compose.c:541
-#: src/mainwindow.c:505
+#: src/compose.c:534 src/compose.c:541 src/mainwindow.c:505
 #: src/messageview.c:147
 msgid "/_Edit/---"
 msgstr "/_Editar/---"
@@ -1422,9 +1319,7 @@ msgstr "/_Editar/---"
 msgid "/_Edit/Cu_t"
 msgstr "/_Editar/_Cortar"
 
-#: src/compose.c:536
-#: src/mainwindow.c:502
-#: src/messageview.c:145
+#: src/compose.c:536 src/mainwindow.c:502 src/messageview.c:145
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/C_opiar"
 
@@ -1436,9 +1331,7 @@ msgstr "/_Editar/Co_lar"
 msgid "/_Edit/Paste as _quotation"
 msgstr "/_Editar/Colar como ci_tação"
 
-#: src/compose.c:540
-#: src/mainwindow.c:503
-#: src/messageview.c:146
+#: src/compose.c:540 src/mainwindow.c:503 src/messageview.c:146
 msgid "/_Edit/Select _all"
 msgstr "/_Editar/_Selecionar tudo"
 
@@ -1454,9 +1347,7 @@ msgstr "/_Editar/Quebrar todas as _linhas compridas"
 msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Quebra automática de linha"
 
-#: src/compose.c:547
-#: src/mainwindow.c:510
-#: src/messageview.c:151
+#: src/compose.c:547 src/mainwindow.c:510 src/messageview.c:151
 #: src/summaryview.c:432
 msgid "/_View"
 msgstr "/E_xibir"
@@ -1477,16 +1368,9 @@ msgstr "/E_xibir/_Cco"
 msgid "/_View/_Reply to"
 msgstr "/E_xibir/_Responder para"
 
-#: src/compose.c:552
-#: src/compose.c:554
-#: src/compose.c:556
-#: src/compose.c:558
-#: src/mainwindow.c:528
-#: src/mainwindow.c:531
-#: src/mainwindow.c:558
-#: src/mainwindow.c:582
-#: src/mainwindow.c:677
-#: src/mainwindow.c:681
+#: src/compose.c:552 src/compose.c:554 src/compose.c:556 src/compose.c:558
+#: src/mainwindow.c:528 src/mainwindow.c:531 src/mainwindow.c:558
+#: src/mainwindow.c:582 src/mainwindow.c:677 src/mainwindow.c:681
 #: src/messageview.c:236
 msgid "/_View/---"
 msgstr "/E_xibir/---"
@@ -1503,9 +1387,7 @@ msgstr "/E_xibir/_Régua"
 msgid "/_View/_Attachment"
 msgstr "/E_xibir/_Anexo"
 
-#: src/compose.c:564
-#: src/mainwindow.c:589
-#: src/messageview.c:158
+#: src/compose.c:564 src/mainwindow.c:589 src/messageview.c:158
 msgid "/_View/Character _encoding"
 msgstr "/E_xibir/_Codificação de caracteres"
 
@@ -1513,159 +1395,102 @@ msgstr "/E_xibir/_Codificação de caracteres"
 msgid "/_View/Character _encoding/_Automatic"
 msgstr "/E_xibir/Codificação de caracteres/_Automático"
 
-#: src/compose.c:567
-#: src/compose.c:573
-#: src/compose.c:579
-#: src/compose.c:583
-#: src/compose.c:589
-#: src/compose.c:593
-#: src/compose.c:599
-#: src/compose.c:603
-#: src/compose.c:613
-#: src/compose.c:617
-#: src/compose.c:625
-#: src/compose.c:629
-#: src/mainwindow.c:585
-#: src/mainwindow.c:592
-#: src/messageview.c:154
+#: src/compose.c:567 src/compose.c:573 src/compose.c:579 src/compose.c:583
+#: src/compose.c:589 src/compose.c:593 src/compose.c:599 src/compose.c:603
+#: src/compose.c:613 src/compose.c:617 src/compose.c:625 src/compose.c:629
+#: src/mainwindow.c:585 src/mainwindow.c:592 src/messageview.c:154
 msgid "/_View/Character _encoding/---"
 msgstr "/E_xibir/_Codificação de caracteres/---"
 
-#: src/compose.c:569
-#: src/mainwindow.c:593
-#: src/messageview.c:162
+#: src/compose.c:569 src/mainwindow.c:593 src/messageview.c:162
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/E_xibir/_Codificação de caracteres/ASCII de 7 bits (US-ASC_II)"
 
-#: src/compose.c:571
-#: src/mainwindow.c:595
-#: src/messageview.c:165
+#: src/compose.c:571 src/mainwindow.c:595 src/messageview.c:165
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/E_xibir/_/Codificação de caracteresUnicode (_UTF-8)"
 
-#: src/compose.c:575
-#: src/mainwindow.c:599
-#: src/messageview.c:168
+#: src/compose.c:575 src/mainwindow.c:599 src/messageview.c:168
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-_1)"
 
-#: src/compose.c:577
-#: src/mainwindow.c:601
-#: src/messageview.c:170
+#: src/compose.c:577 src/mainwindow.c:601 src/messageview.c:170
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/E_xibir/_Codificação de caracteres/Europa Ocidental (ISO-8859-15)"
 
-#: src/compose.c:581
-#: src/mainwindow.c:607
-#: src/messageview.c:175
+#: src/compose.c:581 src/mainwindow.c:607 src/messageview.c:175
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/E_xibir/_/Codificação de caracteres/Europa Central (ISO-8859-_2)"
 
-#: src/compose.c:585
-#: src/mainwindow.c:611
-#: src/messageview.c:178
+#: src/compose.c:585 src/mainwindow.c:611 src/messageview.c:178
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
 msgstr "/E_xibir/_Codificação de caracteres/_Báltico (ISO-8859-13)"
 
-#: src/compose.c:587
-#: src/mainwindow.c:613
-#: src/messageview.c:180
+#: src/compose.c:587 src/mainwindow.c:613 src/messageview.c:180
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
 msgstr "/E_xibir/_Codificação de caracteres/Báltico (ISO-8859-_4)"
 
-#: src/compose.c:591
-#: src/mainwindow.c:617
-#: src/messageview.c:183
+#: src/compose.c:591 src/mainwindow.c:617 src/messageview.c:183
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/E_xibir/_Codificação de caracteres/Grego (ISO-8859-_7)"
 
-#: src/compose.c:595
-#: src/mainwindow.c:621
-#: src/messageview.c:186
+#: src/compose.c:595 src/mainwindow.c:621 src/messageview.c:186
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (ISO-8859-_8)"
 
-#: src/compose.c:597
-#: src/mainwindow.c:623
-#: src/messageview.c:188
+#: src/compose.c:597 src/mainwindow.c:623 src/messageview.c:188
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
 msgstr "/E_xibir/_Codificação de caracteres/Hebreu (Windows-1255)"
 
-#: src/compose.c:601
-#: src/mainwindow.c:627
-#: src/messageview.c:191
+#: src/compose.c:601 src/mainwindow.c:627 src/messageview.c:191
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/E_xibir/_Codificação de caracteres/Turco (ISO-8859-_9)"
 
-#: src/compose.c:605
-#: src/mainwindow.c:631
-#: src/messageview.c:194
+#: src/compose.c:605 src/mainwindow.c:631 src/messageview.c:194
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (ISO-8859-_5)"
 
-#: src/compose.c:607
-#: src/mainwindow.c:633
-#: src/messageview.c:196
+#: src/compose.c:607 src/mainwindow.c:633 src/messageview.c:196
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-_R)"
 
-#: src/compose.c:609
-#: src/mainwindow.c:635
-#: src/messageview.c:198
+#: src/compose.c:609 src/mainwindow.c:635 src/messageview.c:198
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (KOI8-U)"
 
-#: src/compose.c:611
-#: src/mainwindow.c:637
-#: src/messageview.c:200
+#: src/compose.c:611 src/mainwindow.c:637 src/messageview.c:200
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
 msgstr "/E_xibir/_Codificação de caracteres/Cirílico (Windows-1251)"
 
-#: src/compose.c:615
-#: src/mainwindow.c:641
-#: src/messageview.c:203
+#: src/compose.c:615 src/mainwindow.c:641 src/messageview.c:203
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-_JP)"
 
-#: src/compose.c:619
-#: src/mainwindow.c:651
-#: src/messageview.c:212
+#: src/compose.c:619 src/mainwindow.c:651 src/messageview.c:212
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (_GB2312)"
 
-#: src/compose.c:621
-#: src/mainwindow.c:653
-#: src/messageview.c:214
+#: src/compose.c:621 src/mainwindow.c:653 src/messageview.c:214
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês simplificado (GBK)"
 
-#: src/compose.c:623
-#: src/mainwindow.c:655
-#: src/messageview.c:216
+#: src/compose.c:623 src/mainwindow.c:655 src/messageview.c:216
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (_Big5)"
 
-#: src/compose.c:627
-#: src/mainwindow.c:663
-#: src/messageview.c:223
+#: src/compose.c:627 src/mainwindow.c:663 src/messageview.c:223
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (EUC-_KR)"
 
-#: src/compose.c:631
-#: src/mainwindow.c:669
-#: src/messageview.c:228
+#: src/compose.c:631 src/mainwindow.c:669 src/messageview.c:228
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (TIS-620)"
 
-#: src/compose.c:633
-#: src/mainwindow.c:671
-#: src/messageview.c:230
+#: src/compose.c:633 src/mainwindow.c:671 src/messageview.c:230
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/E_xibir/_Codificação de caracteres/Thai (Windows-874)"
 
-#: src/compose.c:637
-#: src/mainwindow.c:728
-#: src/messageview.c:260
+#: src/compose.c:637 src/mainwindow.c:728 src/messageview.c:260
 msgid "/_Tools/_Address book"
 msgstr "/_Ferramentas/_Catálogo de endereços"
 
@@ -1673,22 +1498,13 @@ msgstr "/_Ferramentas/_Catálogo de endereços"
 msgid "/_Tools/_Template"
 msgstr "/_Ferramenta/_Modelo"
 
-#: src/compose.c:639
-#: src/mainwindow.c:751
-#: src/messageview.c:275
+#: src/compose.c:639 src/mainwindow.c:751 src/messageview.c:275
 msgid "/_Tools/Actio_ns"
 msgstr "/_Ferramentas/_Ações"
 
-#: src/compose.c:640
-#: src/compose.c:644
-#: src/compose.c:650
-#: src/mainwindow.c:731
-#: src/mainwindow.c:745
-#: src/mainwindow.c:750
-#: src/mainwindow.c:752
-#: src/mainwindow.c:755
-#: src/mainwindow.c:757
-#: src/messageview.c:263
+#: src/compose.c:640 src/compose.c:644 src/compose.c:650 src/mainwindow.c:731
+#: src/mainwindow.c:745 src/mainwindow.c:750 src/mainwindow.c:752
+#: src/mainwindow.c:755 src/mainwindow.c:757 src/messageview.c:263
 #: src/messageview.c:274
 msgid "/_Tools/---"
 msgstr "/_Ferramentas/---"
@@ -1718,8 +1534,7 @@ msgstr "/_Ferramentas/Definir _idioma do verificador ortográfico"
 msgid "%s: file not exist\n"
 msgstr "%s: o arquivo não existe\n"
 
-#: src/compose.c:996
-#: src/compose.c:1067
+#: src/compose.c:996 src/compose.c:1067
 msgid "Can't get text part\n"
 msgstr "Não foi possível obter o texto\n"
 
@@ -1756,14 +1571,11 @@ msgstr "Não foi possível ler %s."
 msgid "Message: %s"
 msgstr "Mensagem: %s"
 
-#: src/compose.c:1991
-#: src/mimeview.c:565
+#: src/compose.c:1991 src/mimeview.c:565
 msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) dessa mensagem."
 
-#: src/compose.c:2475
-#: src/headerview.c:195
-#: src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
@@ -1797,8 +1609,7 @@ msgstr ""
 "Conta para envio de mensagem não foi especificada.\n"
 "Por favor selecione uma conta de e-mail antes de enviar."
 
-#: src/compose.c:2696
-#: src/send_message.c:299
+#: src/compose.c:2696 src/send_message.c:299
 #, c-format
 msgid "Error occurred while posting the message to %s ."
 msgstr "Erro ao postar a mensagem para %s ."
@@ -1819,7 +1630,8 @@ msgid ""
 "\n"
 "Send it as %s anyway?"
 msgstr ""
-"Não foi possível converter a codificação de caracteres do corpo da mensagem de %s para %s.\n"
+"Não foi possível converter a codificação de caracteres do corpo da mensagem "
+"de %s para %s.\n"
 "\n"
 "Enviar como %s mesmo assim?"
 
@@ -1869,8 +1681,7 @@ msgstr "Message-ID gerado: %s\n"
 msgid "Creating compose window...\n"
 msgstr "Criando janela de composição...\n"
 
-#: src/compose.c:4110
-#: src/headerview.c:54
+#: src/compose.c:4110 src/headerview.c:54
 msgid "From:"
 msgstr "De:"
 
@@ -1882,24 +1693,17 @@ msgstr "Assinar (PGP)"
 msgid "PGP Encrypt"
 msgstr "Encriptar (PGP)"
 
-#: src/compose.c:4225
-#: src/compose.c:5299
+#: src/compose.c:4225 src/compose.c:5299
 msgid "MIME type"
 msgstr "Tipo MIME"
 
 #. S_COL_DATE
-#: src/compose.c:4234
-#: src/mimeview.c:197
-#: src/prefs_filter_edit.c:497
-#: src/prefs_summary_column.c:76
-#: src/select-keys.c:317
-#: src/summaryview.c:4574
+#: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:497
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4574
 msgid "Size"
 msgstr "Tamanho"
 
-#: src/compose.c:4665
-#: src/mainwindow.c:2276
-#: src/prefs_account_dialog.c:525
+#: src/compose.c:4665 src/mainwindow.c:2276 src/prefs_account_dialog.c:525
 #: src/prefs_common_dialog.c:661
 msgid "Send"
 msgstr "Enviar"
@@ -1941,8 +1745,7 @@ msgid "Attach file"
 msgstr "Anexar arquivo"
 
 #. signature
-#: src/compose.c:4714
-#: src/prefs_account_dialog.c:1205
+#: src/compose.c:4714 src/prefs_account_dialog.c:1205
 #: src/prefs_common_dialog.c:954
 msgid "Signature"
 msgstr "Assinatura"
@@ -1952,8 +1755,7 @@ msgid "Insert signature"
 msgstr "Inserir assinatura"
 
 #. editor
-#: src/compose.c:4724
-#: src/prefs_common_dialog.c:992
+#: src/compose.c:4724 src/prefs_common_dialog.c:992
 #: src/prefs_common_dialog.c:2311
 msgid "Editor"
 msgstr "Editor"
@@ -1982,13 +1784,11 @@ msgstr "O arquivo não existe ou está vazio."
 msgid "Properties"
 msgstr "Propriedades"
 
-#: src/compose.c:5301
-#: src/prefs_common_dialog.c:1448
+#: src/compose.c:5301 src/prefs_common_dialog.c:1448
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:5324
-#: src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:203
 msgid "Path"
 msgstr "Caminho"
 
@@ -2010,9 +1810,7 @@ msgstr ""
 "O editor externo está ativo.\n"
 "Forçar a finalização do processo (pid: %d)?\n"
 
-#: src/compose.c:5839
-#: src/compose.c:5847
-#: src/compose.c:5853
+#: src/compose.c:5839 src/compose.c:5847 src/compose.c:5853
 msgid "Can't queue the message."
 msgstr "Não foi possível enfileirar a mensagem."
 
@@ -2083,13 +1881,11 @@ msgstr "Editar dados pessoais"
 msgid "Display Name"
 msgstr "Exibir Nome"
 
-#: src/editaddress.c:750
-#: src/editaddress.c:754
+#: src/editaddress.c:750 src/editaddress.c:754
 msgid "Last Name"
 msgstr "Último Nome"
 
-#: src/editaddress.c:751
-#: src/editaddress.c:753
+#: src/editaddress.c:751 src/editaddress.c:753
 msgid "First Name"
 msgstr "Primeiro Nome"
 
@@ -2097,15 +1893,12 @@ msgstr "Primeiro Nome"
 msgid "Nick Name"
 msgstr "Apelido"
 
-#: src/editaddress.c:793
-#: src/editaddress.c:842
-#: src/editaddress.c:1051
+#: src/editaddress.c:793 src/editaddress.c:842 src/editaddress.c:1051
 #: src/editgroup.c:266
 msgid "E-Mail Address"
 msgstr "Endereço de e-mail"
 
-#: src/editaddress.c:794
-#: src/editaddress.c:851
+#: src/editaddress.c:794 src/editaddress.c:851
 msgid "Alias"
 msgstr "Apelido"
 
@@ -2118,20 +1911,15 @@ msgstr "Mover para cima"
 msgid "Move Down"
 msgstr "Mover para Baixo"
 
-#: src/editaddress.c:887
-#: src/editaddress.c:1020
-#: src/importldif.c:642
+#: src/editaddress.c:887 src/editaddress.c:1020 src/importldif.c:642
 msgid "Modify"
 msgstr "Modificar"
 
-#: src/editaddress.c:893
-#: src/editaddress.c:1026
+#: src/editaddress.c:893 src/editaddress.c:1026
 msgid "Clear"
 msgstr "Limpar"
 
-#: src/editaddress.c:943
-#: src/editaddress.c:999
-#: src/prefs_customheader.c:203
+#: src/editaddress.c:943 src/editaddress.c:999 src/prefs_customheader.c:203
 msgid "Value"
 msgstr "Valor"
 
@@ -2151,26 +1939,19 @@ msgstr "O arquivo parece estar OK."
 msgid "File does not appear to be a valid address book format."
 msgstr "O arquivo não parece estar no formato válido de catálogo de endereços."
 
-#: src/editbook.c:126
-#: src/editjpilot.c:204
-#: src/editvcard.c:108
+#: src/editbook.c:126 src/editjpilot.c:204 src/editvcard.c:108
 msgid "Could not read file."
 msgstr "Não foi possível ler o arquivo"
 
-#: src/editbook.c:174
-#: src/editbook.c:288
+#: src/editbook.c:174 src/editbook.c:288
 msgid "Edit Addressbook"
 msgstr "Editar Catálogo de Endereços"
 
-#: src/editbook.c:203
-#: src/editjpilot.c:278
-#: src/editvcard.c:191
+#: src/editbook.c:203 src/editjpilot.c:278 src/editvcard.c:191
 msgid " Check File "
 msgstr " Verificar Arquivo "
 
-#: src/editbook.c:208
-#: src/editjpilot.c:283
-#: src/editvcard.c:196
+#: src/editbook.c:208 src/editjpilot.c:283 src/editvcard.c:196
 #: src/prefs_account_dialog.c:1216
 msgid "File"
 msgstr "Arquivo"
@@ -2209,7 +1990,8 @@ msgstr "Endereços Disponíveis"
 
 #: src/editgroup.c:416
 msgid "Move E-Mail Addresses to or from Group with arrow buttons"
-msgstr "Mover endreços de e-mail para ou a partir grupos com as setas dos botões"
+msgstr ""
+"Mover endreços de e-mail para ou a partir grupos com as setas dos botões"
 
 #: src/editgroup.c:468
 msgid "Edit Group Details"
@@ -2227,16 +2009,12 @@ msgstr "Editar pasta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:525
-#: src/foldersel.c:540
-#: src/folderview.c:2060
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
 #: src/folderview.c:2066
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:526
-#: src/foldersel.c:541
-#: src/folderview.c:2067
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -2248,16 +2026,12 @@ msgstr "O arquivo não parece estar no formato JPilot."
 msgid "Select JPilot File"
 msgstr "Selecionar Arquivo JPilot"
 
-#: src/editjpilot.c:249
-#: src/editjpilot.c:381
+#: src/editjpilot.c:249 src/editjpilot.c:381
 msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
-#: src/editjpilot.c:290
-#: src/editldap.c:349
-#: src/editvcard.c:203
-#: src/importldif.c:534
-#: src/prefs_account_dialog.c:1715
+#: src/editjpilot.c:290 src/editldap.c:349 src/editvcard.c:203
+#: src/importldif.c:534 src/prefs_account_dialog.c:1715
 #: src/prefs_common_dialog.c:1849
 msgid " ... "
 msgstr " ... "
@@ -2274,23 +2048,19 @@ msgstr "Adicionar nova entrada JPilot"
 msgid "Connected successfully to server"
 msgstr "Conectado ao servidor com sucesso"
 
-#: src/editldap.c:174
-#: src/editldap_basedn.c:299
+#: src/editldap.c:174 src/editldap_basedn.c:299
 msgid "Could not connect to server"
 msgstr "Não foi possível conectar ao servidor"
 
-#: src/editldap.c:222
-#: src/editldap.c:546
+#: src/editldap.c:222 src/editldap.c:546
 msgid "Edit LDAP Server"
 msgstr "Editar Servidor LDAP"
 
-#: src/editldap.c:316
-#: src/editldap_basedn.c:168
+#: src/editldap.c:316 src/editldap_basedn.c:168
 msgid "Hostname"
 msgstr "Nome da máquina"
 
-#: src/editldap.c:325
-#: src/editldap_basedn.c:178
+#: src/editldap.c:325 src/editldap_basedn.c:178
 msgid "Port"
 msgstr "Porta"
 
@@ -2298,8 +2068,7 @@ msgstr "Porta"
 msgid " Check Server "
 msgstr " Conferir Servidor "
 
-#: src/editldap.c:342
-#: src/editldap_basedn.c:188
+#: src/editldap.c:342 src/editldap_basedn.c:188
 msgid "Search Base"
 msgstr "Procurar Base"
 
@@ -2327,8 +2096,7 @@ msgstr "Timeout (segundos)"
 msgid "Maximum Entries"
 msgstr "Máximo de Entradas"
 
-#: src/editldap.c:471
-#: src/prefs_account_dialog.c:521
+#: src/editldap.c:471 src/prefs_account_dialog.c:521
 msgid "Basic"
 msgstr "Básicas"
 
@@ -2350,7 +2118,9 @@ msgstr "Base(s) de Procura disponível(is)"
 
 #: src/editldap_basedn.c:295
 msgid "Could not read Search Base(s) from server - please set manually"
-msgstr "Não foi spossível ler a(s) Base(s) de Procura do servidor - por favor defina manualmente"
+msgstr ""
+"Não foi spossível ler a(s) Base(s) de Procura do servidor - por favor defina "
+"manualmente"
 
 #: src/editvcard.c:105
 msgid "File does not appear to be vCard format."
@@ -2360,8 +2130,7 @@ msgstr "O arquivo não parece estar no formato vCard."
 msgid "Select vCard File"
 msgstr "Selecionar Arquivo vCard"
 
-#: src/editvcard.c:162
-#: src/editvcard.c:270
+#: src/editvcard.c:162 src/editvcard.c:270
 msgid "Edit vCard Entry"
 msgstr "Editar Entrada vCard"
 
@@ -2385,10 +2154,7 @@ msgstr "Diretório fonte:"
 msgid "Exporting file:"
 msgstr "Arquivo a exportar:"
 
-#: src/export.c:185
-#: src/export.c:191
-#: src/import.c:191
-#: src/import.c:197
+#: src/export.c:185 src/export.c:191 src/import.c:191 src/import.c:197
 #: src/prefs_account_dialog.c:916
 msgid " Select... "
 msgstr "Selecionar..."
@@ -2417,113 +2183,83 @@ msgstr "Selecionar diretório"
 msgid "Select folder"
 msgstr "Selecione uma pasta"
 
-#: src/foldersel.c:359
-#: src/folderview.c:1158
-#: src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: src/foldersel.c:363
-#: src/folderview.c:1164
-#: src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Enviadas"
 
-#: src/foldersel.c:367
-#: src/folderview.c:1170
-#: src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Fila de saída"
 
-#: src/foldersel.c:371
-#: src/folderview.c:1176
-#: src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/foldersel.c:375
-#: src/folderview.c:1182
-#: src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:542
-#: src/folderview.c:2064
-#: src/folderview.c:2068
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:550
-#: src/folderview.c:2076
-#: src/folderview.c:2137
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' não pode ser usado no nome da pasta."
 
-#: src/foldersel.c:560
-#: src/folderview.c:2086
-#: src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta `%s' já existe."
 
-#: src/foldersel.c:568
-#: src/folderview.c:2093
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "não foi possível criar a pasta `%s'."
 
-#: src/folderview.c:241
-#: src/folderview.c:259
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Criar _nova pasta..."
 
-#: src/folderview.c:242
-#: src/folderview.c:260
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/_Renomear pasta..."
 
-#: src/folderview.c:243
-#: src/folderview.c:261
+#: src/folderview.c:243 src/folderview.c:261
 msgid "/_Move folder..."
 msgstr "/_Mover pasta..."
 
-#: src/folderview.c:244
-#: src/folderview.c:262
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Apagar pasta"
 
-#: src/folderview.c:246
-#: src/folderview.c:264
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/Esvaziar _lixeira"
 
-#: src/folderview.c:248
-#: src/folderview.c:268
-#: src/folderview.c:285
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/_Buscar novas mensagens"
 
-#: src/folderview.c:250
-#: src/folderview.c:270
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/_Atualizar árvore de pastas"
 
-#: src/folderview.c:251
-#: src/folderview.c:271
-#: src/folderview.c:287
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 msgid "/_Update summary"
 msgstr "/A_tualizar sumário"
 
-#: src/folderview.c:253
-#: src/folderview.c:273
-#: src/folderview.c:289
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/_Procurar mensagens..."
 
-#: src/folderview.c:266
-#: src/folderview.c:283
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/_Baixar"
 
@@ -2544,8 +2280,7 @@ msgid "New"
 msgstr "Nova"
 
 #. S_COL_MARK
-#: src/folderview.c:403
-#: src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Não lido"
 
@@ -2561,16 +2296,12 @@ msgstr "Configurando informações da pasta...\n"
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:849
-#: src/mainwindow.c:3360
-#: src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:853
-#: src/mainwindow.c:3365
-#: src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
@@ -2595,9 +2326,7 @@ msgstr "Falha ao tentar reconstruir a árvore de pastas."
 msgid "Checking for new messages in all folders..."
 msgstr "Checar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1190
-#: src/mainwindow.c:2352
-#: src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr "Spam"
 
@@ -2641,21 +2370,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Não foi possível mover a pasta `%s'."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
 "A pasta de busca '%s' será apagada.\n"
 "As mensagens reais não serão apagadas.\n"
 "Deseja apagar a pasta?"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 msgid "Delete search folder"
 msgstr "Apagar pasta de busca"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2668,21 +2396,20 @@ msgstr ""
 "\n"
 "Quer realmente apagá-las?"
 
-#: src/folderview.c:2337
-#: src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 msgid "Delete all messages in the trash folder?"
 msgstr "Apagar todas as mensagens da lixeira?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2691,34 +2418,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens NÃO são apagadas do disco)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de notícias"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de notícias"
 
@@ -2726,8 +2453,7 @@ msgstr "Apagar conta de grupo de notícias"
 msgid "Newsgroups:"
 msgstr "Grupos de notícias:"
 
-#: src/headerview.c:57
-#: src/prefs_template.c:180
+#: src/headerview.c:57 src/prefs_template.c:180
 msgid "Subject:"
 msgstr "Assunto:"
 
@@ -2735,9 +2461,7 @@ msgstr "Assunto:"
 msgid "Creating header view...\n"
 msgstr "Criando visualizador de cabeçalhos...\n"
 
-#: src/headerview.c:180
-#: src/summary_search.c:641
-#: src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Sem remetente)"
 
@@ -2771,7 +2495,8 @@ msgstr "Selecionar arquivo a importar"
 
 #: src/importldif.c:125
 msgid "Please specify address book name and file to import."
-msgstr "Por favor especifique o nome do livro de endereços e o arquivo para importar."
+msgstr ""
+"Por favor especifique o nome do livro de endereços e o arquivo para importar."
 
 #: src/importldif.c:128
 msgid "Select and rename LDIF field names to import."
@@ -2809,8 +2534,7 @@ msgstr "Nome do arquivo"
 msgid "S"
 msgstr "S"
 
-#: src/importldif.c:567
-#: src/importldif.c:616
+#: src/importldif.c:567 src/importldif.c:616
 msgid "LDIF Field"
 msgstr "Campo LDIF"
 
@@ -2822,8 +2546,7 @@ msgstr "Nome do Atributo"
 msgid "Attribute"
 msgstr "Atributo"
 
-#: src/importldif.c:635
-#: src/select-keys.c:342
+#: src/importldif.c:635 src/select-keys.c:342
 msgid "Select"
 msgstr "Selecione"
 
@@ -2848,8 +2571,7 @@ msgstr "Importar arquivo LDIF para o Livro de Endereços"
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importldif.c:768
-#: src/mainwindow.c:2372
+#: src/importldif.c:768 src/mainwindow.c:2372
 msgid "Next"
 msgstr "Próxima"
 
@@ -2882,8 +2604,7 @@ msgstr "Obtendo novas mensagens"
 msgid "Standby"
 msgstr "Aguardando"
 
-#: src/inc.c:543
-#: src/inc.c:592
+#: src/inc.c:543 src/inc.c:592
 msgid "Cancelled"
 msgstr "Cancelado"
 
@@ -2949,8 +2670,7 @@ msgstr "Conectando ao servidor POP3: %s..."
 msgid "Can't connect to POP3 server: %s:%d\n"
 msgstr "Não foi possível se conectar ao servidor POP3: %s:%d\n"
 
-#: src/inc.c:797
-#: src/send_message.c:631
+#: src/inc.c:797 src/send_message.c:631
 msgid "Authenticating..."
 msgstr "Autenticando..."
 
@@ -2980,8 +2700,7 @@ msgstr "Obtendo o número de novas mensagens (LIST)..."
 msgid "Deleting message %d"
 msgstr "Apagando mensagem %d"
 
-#: src/inc.c:832
-#: src/send_message.c:649
+#: src/inc.c:832 src/send_message.c:649
 msgid "Quitting"
 msgstr "Saindo"
 
@@ -3025,9 +2744,7 @@ msgid "Socket error."
 msgstr "erro de socket."
 
 #. consider EOF right after QUIT successful
-#: src/inc.c:1139
-#: src/send_message.c:584
-#: src/send_message.c:772
+#: src/inc.c:1139 src/send_message.c:584 src/send_message.c:772
 msgid "Connection closed by the remote host."
 msgstr "Conexão remota finalizada pela estação remota."
 
@@ -3044,13 +2761,11 @@ msgstr ""
 "Caixa de correio está trancada:\n"
 "%s"
 
-#: src/inc.c:1155
-#: src/send_message.c:757
+#: src/inc.c:1155 src/send_message.c:757
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
-#: src/inc.c:1160
-#: src/send_message.c:760
+#: src/inc.c:1160 src/send_message.c:760
 #, c-format
 msgid ""
 "Authentication failed:\n"
@@ -3059,8 +2774,7 @@ msgstr ""
 "Falha de autenticação:\n"
 "%s"
 
-#: src/inc.c:1165
-#: src/send_message.c:776
+#: src/inc.c:1165 src/send_message.c:776
 msgid "Session timed out."
 msgstr "Tempo limite da sessão."
 
@@ -3134,8 +2848,11 @@ msgstr ""
 "                         exibe o status de cada pasta"
 
 #: src/main.c:374
-msgid "  --configdir dirname    specify directory which stores configuration files"
-msgstr "  --configdir diretório    especifica o diretório que armazena os arquivos de configuração"
+msgid ""
+"  --configdir dirname    specify directory which stores configuration files"
+msgstr ""
+"  --configdir diretório    especifica o diretório que armazena os arquivos "
+"de configuração"
 
 #: src/main.c:375
 msgid "  --exit                 exit Sylpheed"
@@ -3159,17 +2876,23 @@ msgstr "Codificação de nome de arquivo"
 
 #: src/main.c:518
 msgid ""
-"The locale encoding is not UTF-8, but the environmental variable G_FILENAME_ENCODING is not set.\n"
-"If the locale encoding is used for file name or directory name, it will not work correctly.\n"
-"In that case, you must set the following environmental variable (see README for detail):\n"
+"The locale encoding is not UTF-8, but the environmental variable "
+"G_FILENAME_ENCODING is not set.\n"
+"If the locale encoding is used for file name or directory name, it will not "
+"work correctly.\n"
+"In that case, you must set the following environmental variable (see README "
+"for detail):\n"
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 "\n"
 "Continue?"
 msgstr ""
-"A codificação local não é UTF-8, e a variável de ambiente G_FILENAME_ENCODING não está definida.\n"
-"Se a codificação local for usada para nomes de arquivo ou diretório, funcionará corretamente.\n"
-"Neste caso, você deve definir a seguinte variável de ambiente (veja o README para detalhes):\n"
+"A codificação local não é UTF-8, e a variável de ambiente "
+"G_FILENAME_ENCODING não está definida.\n"
+"Se a codificação local for usada para nomes de arquivo ou diretório, "
+"funcionará corretamente.\n"
+"Neste caso, você deve definir a seguinte variável de ambiente (veja o README "
+"para detalhes):\n"
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 "\n"
@@ -3244,8 +2967,7 @@ msgstr "/_Arquivo/_Caixa de correio/_Adicionar caixa de correio..."
 msgid "/_File/_Mailbox/_Remove mailbox"
 msgstr "/_Arquivo/_Caixa de correio/Remover _caixa de correio"
 
-#: src/mainwindow.c:479
-#: src/mainwindow.c:484
+#: src/mainwindow.c:479 src/mainwindow.c:484
 msgid "/_File/_Mailbox/---"
 msgstr "/_Arquivo/_Caixa de correio/---"
 
@@ -3273,13 +2995,11 @@ msgstr "/_Arquivo/_Exportar para arquivo mbox..."
 msgid "/_File/Empty all _trash"
 msgstr "/_Arquivo/Esvaziar _lixeira"
 
-#: src/mainwindow.c:493
-#: src/messageview.c:139
+#: src/mainwindow.c:493 src/messageview.c:139
 msgid "/_File/_Save as..."
 msgstr "/_Arquivo/_Salvar como..."
 
-#: src/mainwindow.c:494
-#: src/messageview.c:140
+#: src/mainwindow.c:494 src/messageview.c:140
 msgid "/_File/_Print..."
 msgstr "/_Arquivo/Im_primir"
 
@@ -3296,8 +3016,7 @@ msgstr "/_Arquivo/Sai_r"
 msgid "/_Edit/Select _thread"
 msgstr "/_Editar/_Selecionar t_hread"
 
-#: src/mainwindow.c:506
-#: src/messageview.c:148
+#: src/mainwindow.c:506 src/messageview.c:148
 msgid "/_Edit/_Find in current message..."
 msgstr "/_Editar/_Encontrar na mensagem atual..."
 
@@ -3401,8 +3120,7 @@ msgstr "/E_xibir/_Ordenar/por _anexos"
 msgid "/_View/_Sort/D_on't sort"
 msgstr "/E_xibir/_Ordenar/_Não ordenar"
 
-#: src/mainwindow.c:547
-#: src/mainwindow.c:550
+#: src/mainwindow.c:547 src/mainwindow.c:550
 msgid "/_View/_Sort/---"
 msgstr "/E_xibir/_Ordenar/---"
 
@@ -3446,11 +3164,8 @@ msgstr "/E_xibir/Ir _Para/Mensagem a_nterior"
 msgid "/_View/_Go to/_Next message"
 msgstr "/E_xibir/Ir _Para/_Próxima mensagem"
 
-#: src/mainwindow.c:562
-#: src/mainwindow.c:567
-#: src/mainwindow.c:570
-#: src/mainwindow.c:575
-#: src/mainwindow.c:580
+#: src/mainwindow.c:562 src/mainwindow.c:567 src/mainwindow.c:570
+#: src/mainwindow.c:575 src/mainwindow.c:580
 msgid "/_View/_Go to/---"
 msgstr "/E_xibir/Ir _Para/---"
 
@@ -3490,58 +3205,47 @@ msgstr "/E_xibir/Ir _Para/Próxima mensagem etique_tada"
 msgid "/_View/_Go to/Other _folder..."
 msgstr "/E_xibir/Ir _Para/Outra _pasta..."
 
-#: src/mainwindow.c:590
-#: src/messageview.c:159
+#: src/mainwindow.c:590 src/messageview.c:159
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/E_xibir/_Codificação de caracteres/_Detectar automaticamente"
 
-#: src/mainwindow.c:603
-#: src/messageview.c:172
+#: src/mainwindow.c:603 src/messageview.c:172
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
 msgstr "/E_xibir/_Codificação de caracteres/Europeu Ocidental (Windows-1252)"
 
-#: src/mainwindow.c:643
-#: src/messageview.c:205
+#: src/mainwindow.c:643 src/messageview.c:205
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (ISO-2022-JP-2)"
 
-#: src/mainwindow.c:645
-#: src/messageview.c:207
+#: src/mainwindow.c:645 src/messageview.c:207
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_EUC-JP)"
 
-#: src/mainwindow.c:647
-#: src/messageview.c:209
+#: src/mainwindow.c:647 src/messageview.c:209
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/E_xibir/_Codificação de caracteres/Japonês (_Shift__JIS)"
 
-#: src/mainwindow.c:657
-#: src/messageview.c:218
+#: src/mainwindow.c:657 src/messageview.c:218
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês tradicional (EUC-_TW)"
 
-#: src/mainwindow.c:659
-#: src/messageview.c:220
+#: src/mainwindow.c:659 src/messageview.c:220
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/E_xibir/_Codificação de caracteres/Chinês (ISO-2022-_CN)"
 
-#: src/mainwindow.c:665
-#: src/messageview.c:225
+#: src/mainwindow.c:665 src/messageview.c:225
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:678
-#: src/summaryview.c:433
+#: src/mainwindow.c:678 src/summaryview.c:433
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma n_ova janela"
 
-#: src/mainwindow.c:679
-#: src/messageview.c:237
+#: src/mainwindow.c:679 src/messageview.c:237
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
-#: src/mainwindow.c:680
-#: src/messageview.c:238
+#: src/mainwindow.c:680 src/messageview.c:238
 msgid "/_View/Show all _header"
 msgstr "/E_xibir/_Mostrar todos os cabeçalhos"
 
@@ -3549,8 +3253,7 @@ msgstr "/E_xibir/_Mostrar todos os cabeçalhos"
 msgid "/_View/_Update summary"
 msgstr "/E_xibir/A_tualizar sumário"
 
-#: src/mainwindow.c:684
-#: src/messageview.c:240
+#: src/mainwindow.c:684 src/messageview.c:240
 msgid "/_Message"
 msgstr "/_Mensagem"
 
@@ -3578,26 +3281,18 @@ msgstr "/_Mensagem/_Receber/---"
 msgid "/_Message/_Send queued messages"
 msgstr "/_Mensagem/Enviar mensagens da _fila"
 
-#: src/mainwindow.c:694
-#: src/mainwindow.c:696
-#: src/mainwindow.c:703
-#: src/mainwindow.c:708
-#: src/mainwindow.c:712
-#: src/mainwindow.c:721
-#: src/mainwindow.c:724
-#: src/messageview.c:243
-#: src/messageview.c:251
+#: src/mainwindow.c:694 src/mainwindow.c:696 src/mainwindow.c:703
+#: src/mainwindow.c:708 src/mainwindow.c:712 src/mainwindow.c:721
+#: src/mainwindow.c:724 src/messageview.c:243 src/messageview.c:251
 #: src/messageview.c:256
 msgid "/_Message/---"
 msgstr "/_Mensagem/---"
 
-#: src/mainwindow.c:695
-#: src/messageview.c:241
+#: src/mainwindow.c:695 src/messageview.c:241
 msgid "/_Message/Compose _new message"
 msgstr "/_Mensagem/Compor _nova mensagem"
 
-#: src/mainwindow.c:697
-#: src/messageview.c:244
+#: src/mainwindow.c:697 src/messageview.c:244
 msgid "/_Message/_Reply"
 msgstr "/_Mensagem/_Responder"
 
@@ -3605,33 +3300,27 @@ msgstr "/_Mensagem/_Responder"
 msgid "/_Message/Repl_y to"
 msgstr "/_Mensagem/_Responder para"
 
-#: src/mainwindow.c:699
-#: src/messageview.c:245
+#: src/mainwindow.c:699 src/messageview.c:245
 msgid "/_Message/Repl_y to/_all"
 msgstr "/Mensagem/Responder para/_todos"
 
-#: src/mainwindow.c:700
-#: src/messageview.c:247
+#: src/mainwindow.c:700 src/messageview.c:247
 msgid "/_Message/Repl_y to/_sender"
 msgstr "/_Mensagem/Responder para/_quem enviou"
 
-#: src/mainwindow.c:701
-#: src/messageview.c:249
+#: src/mainwindow.c:701 src/messageview.c:249
 msgid "/_Message/Repl_y to/mailing _list"
 msgstr "/Mensagem/Responder para/_lista"
 
-#: src/mainwindow.c:704
-#: src/messageview.c:252
+#: src/mainwindow.c:704 src/messageview.c:252
 msgid "/_Message/_Forward"
 msgstr "/_Mensagem/Encam_inhar"
 
-#: src/mainwindow.c:705
-#: src/messageview.c:253
+#: src/mainwindow.c:705 src/messageview.c:253
 msgid "/_Message/For_ward as attachment"
 msgstr "/_Mensagem/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:707
-#: src/messageview.c:255
+#: src/mainwindow.c:707 src/messageview.c:255
 msgid "/_Message/Redirec_t"
 msgstr "/_Mensagem/Redire_cionar"
 
@@ -3683,8 +3372,7 @@ msgstr "/_Mensagem/Classificar como _spam"
 msgid "/_Message/Set as not j_unk mail"
 msgstr "/_Mensagem/Classificar como _não-spam"
 
-#: src/mainwindow.c:725
-#: src/messageview.c:257
+#: src/mainwindow.c:725 src/messageview.c:257
 msgid "/_Message/Re-_edit"
 msgstr "/_Mensagem/Ed_itar novamente"
 
@@ -3700,28 +3388,23 @@ msgstr "/_Ferramentas/Filtrar _todas as mensagens na pasta"
 msgid "/_Tools/Filter _selected messages"
 msgstr "/_Ferramentas/_Filtrar mensagens selecionadas"
 
-#: src/mainwindow.c:736
-#: src/messageview.c:264
+#: src/mainwindow.c:736 src/messageview.c:264
 msgid "/_Tools/_Create filter rule"
 msgstr "/_Ferramentas/_Criar regra de filtro"
 
-#: src/mainwindow.c:737
-#: src/messageview.c:266
+#: src/mainwindow.c:737 src/messageview.c:266
 msgid "/_Tools/_Create filter rule/_Automatically"
 msgstr "/_Ferramentas/_Criar regra de filtro/_Automaticamente"
 
-#: src/mainwindow.c:739
-#: src/messageview.c:268
+#: src/mainwindow.c:739 src/messageview.c:268
 msgid "/_Tools/_Create filter rule/by _From"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _remtente"
 
-#: src/mainwindow.c:741
-#: src/messageview.c:270
+#: src/mainwindow.c:741 src/messageview.c:270
 msgid "/_Tools/_Create filter rule/by _To"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo _destinatário"
 
-#: src/mainwindow.c:743
-#: src/messageview.c:272
+#: src/mainwindow.c:743 src/messageview.c:272
 msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/_Ferramentas/_Criar regra de filtro/pelo A_ssunto"
 
@@ -3834,18 +3517,12 @@ msgstr "Criando janela principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1085
-#: src/summaryview.c:2129
-#: src/summaryview.c:2225
-#: src/summaryview.c:3587
-#: src/summaryview.c:3708
-#: src/summaryview.c:4060
+#: src/mainwindow.c:1085 src/summaryview.c:2129 src/summaryview.c:2225
+#: src/summaryview.c:3587 src/summaryview.c:3708 src/summaryview.c:4060
 msgid "done.\n"
 msgstr "Pronto.\n"
 
-#: src/mainwindow.c:1212
-#: src/mainwindow.c:1253
-#: src/mainwindow.c:1281
+#: src/mainwindow.c:1212 src/mainwindow.c:1253 src/mainwindow.c:1281
 msgid "Untitled"
 msgstr "Sem título"
 
@@ -3888,25 +3565,24 @@ msgstr ""
 "Se uma caixa de correio existente for especificada, ela será\n"
 "analisada automaticamente."
 
-#: src/mainwindow.c:1636
-#: src/setup.c:49
+#: src/mainwindow.c:1636 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
 msgstr "A caixa de correio `%s' já existe."
 
-#: src/mainwindow.c:1641
-#: src/setup.c:56
+#: src/mainwindow.c:1641 src/setup.c:56
 msgid "Mailbox"
 msgstr "Correio"
 
-#: src/mainwindow.c:1647
-#: src/setup.c:62
+#: src/mainwindow.c:1647 src/setup.c:62
 msgid ""
 "Creation of the mailbox failed.\n"
-"Maybe some files already exist, or you don't have the permission to write there."
+"Maybe some files already exist, or you don't have the permission to write "
+"there."
 msgstr ""
 "A criação da caixa de correio falhou.\n"
-"Talvez alguns arquivos já existam, ou você não tem permissão para escrever lá."
+"Talvez alguns arquivos já existam, ou você não tem permissão para escrever "
+"lá."
 
 #: src/mainwindow.c:2040
 msgid "Sylpheed - Folder View"
@@ -3916,8 +3592,7 @@ msgstr "Sylpheed - Visão de Pastas"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2211
-#: src/summaryview.c:393
+#: src/mainwindow.c:2211 src/summaryview.c:393
 msgid "/_Reply"
 msgstr "/_Responder"
 
@@ -3933,18 +3608,15 @@ msgstr "/Responder para o _remetente"
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a /_lista"
 
-#: src/mainwindow.c:2219
-#: src/summaryview.c:400
+#: src/mainwindow.c:2219 src/summaryview.c:400
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2220
-#: src/summaryview.c:401
+#: src/mainwindow.c:2220 src/summaryview.c:401
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2221
-#: src/summaryview.c:402
+#: src/mainwindow.c:2221 src/summaryview.c:402
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
@@ -3968,10 +3640,8 @@ msgstr "Incorporar novas mensagens de todas as contas"
 msgid "Send queued message(s)"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/mainwindow.c:2287
-#: src/prefs_account_dialog.c:527
-#: src/prefs_common_dialog.c:663
-#: src/prefs_folder_item.c:140
+#: src/mainwindow.c:2287 src/prefs_account_dialog.c:527
+#: src/prefs_common_dialog.c:663 src/prefs_folder_item.c:140
 msgid "Compose"
 msgstr "Escrever"
 
@@ -3979,13 +3649,11 @@ msgstr "Escrever"
 msgid "Compose new message"
 msgstr "Escrever nova mensagem"
 
-#: src/mainwindow.c:2296
-#: src/prefs_common_dialog.c:976
+#: src/mainwindow.c:2296 src/prefs_common_dialog.c:976
 msgid "Reply"
 msgstr "Responder"
 
-#: src/mainwindow.c:2297
-#: src/mainwindow.c:2310
+#: src/mainwindow.c:2297 src/mainwindow.c:2310
 msgid "Reply to the message"
 msgstr "Responder à Mensagem"
 
@@ -3997,13 +3665,11 @@ msgstr "Responder todas"
 msgid "Reply to all"
 msgstr "Responder para todos"
 
-#: src/mainwindow.c:2323
-#: src/prefs_filter_edit.c:654
+#: src/mainwindow.c:2323 src/prefs_filter_edit.c:654
 msgid "Forward"
 msgstr "Encaminhar"
 
-#: src/mainwindow.c:2324
-#: src/mainwindow.c:2337
+#: src/mainwindow.c:2324 src/mainwindow.c:2337
 msgid "Forward the message"
 msgstr "Encaminhar a mensagem"
 
@@ -4035,10 +3701,8 @@ msgstr "Preferências"
 msgid "Common preferences"
 msgstr "Preferências comuns"
 
-#: src/mainwindow.c:2394
-#: src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301
-#: src/progressdialog.c:128
+#: src/mainwindow.c:2394 src/prefs_folder_item.c:290
+#: src/prefs_folder_item.c:301 src/progressdialog.c:128
 msgid "Account"
 msgstr "Conta"
 
@@ -4070,8 +3734,7 @@ msgstr "Encontrar na mensagem atual"
 msgid "Find text:"
 msgstr "Encontrar texto:"
 
-#: src/message_search.c:141
-#: src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Maiús./minús."
 
@@ -4115,30 +3778,24 @@ msgstr "Anexos"
 msgid "Message View - Sylpheed"
 msgstr "Visualização da Mensagem - Sylpheed"
 
-#: src/messageview.c:669
-#: src/summaryview.c:3131
+#: src/messageview.c:669 src/summaryview.c:3131
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo `%s'."
 
-#: src/messageview.c:728
-#: src/summaryview.c:3154
+#: src/messageview.c:728 src/summaryview.c:3154
 msgid "The message will be printed with the following command:"
 msgstr "A mensagem será impressa com o seguinte comando:"
 
-#: src/messageview.c:729
-#: src/summaryview.c:3155
+#: src/messageview.c:729 src/summaryview.c:3155
 msgid "(Default print command)"
 msgstr "(Comando padrão de impressão)"
 
-#: src/messageview.c:731
-#: src/prefs_common_dialog.c:2300
-#: src/summaryview.c:3157
+#: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3157
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:740
-#: src/summaryview.c:3166
+#: src/messageview.c:740 src/summaryview.c:3166
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4211,9 +3868,7 @@ msgstr ""
 msgid "_Check signature"
 msgstr "/_Verificar assinatura"
 
-#: src/mimeview.c:970
-#: src/mimeview.c:1037
-#: src/mimeview.c:1070
+#: src/mimeview.c:970 src/mimeview.c:1037 src/mimeview.c:1070
 #: src/mimeview.c:1093
 msgid "Can't save the part of multipart message."
 msgstr "Não foi possível gravar alguma(s) parte(s) dessa mensagem"
@@ -4241,11 +3896,15 @@ msgstr "Abrindo arquivo executável"
 
 #: src/mimeview.c:1143
 msgid ""
-"This is an executable file. Opening executable file is restricted for security.\n"
-"If you want to launch it, save it to somewhere and make sure it is not an virus or something like a malicious program."
+"This is an executable file. Opening executable file is restricted for "
+"security.\n"
+"If you want to launch it, save it to somewhere and make sure it is not an "
+"virus or something like a malicious program."
 msgstr ""
-"Este é um arquivo executável. Abrir um arquivo executável está restrito por questões de segurança.\n"
-"Se você quer executá-lo, salve-o em algum diretório e certifique-se de que não seja um vírus ou programa malicioso."
+"Este é um arquivo executável. Abrir um arquivo executável está restrito por "
+"questões de segurança.\n"
+"Se você quer executá-lo, salve-o em algum diretório e certifique-se de que "
+"não seja um vírus ou programa malicioso."
 
 #: src/mimeview.c:1179
 #, c-format
@@ -4302,13 +3961,11 @@ msgstr "Preferências da Conta"
 msgid "Creating account preferences window...\n"
 msgstr "Criando janela de preferências da conta...\n"
 
-#: src/prefs_account_dialog.c:523
-#: src/prefs_common_dialog.c:659
+#: src/prefs_account_dialog.c:523 src/prefs_common_dialog.c:659
 msgid "Receive"
 msgstr "Receber"
 
-#: src/prefs_account_dialog.c:530
-#: src/prefs_common_dialog.c:670
+#: src/prefs_account_dialog.c:530 src/prefs_common_dialog.c:670
 msgid "Privacy"
 msgstr "Privacidade"
 
@@ -4316,8 +3973,7 @@ msgstr "Privacidade"
 msgid "SSL"
 msgstr "SSL"
 
-#: src/prefs_account_dialog.c:537
-#: src/prefs_common_dialog.c:2102
+#: src/prefs_account_dialog.c:537 src/prefs_common_dialog.c:2102
 msgid "Advanced"
 msgstr "Avançadas"
 
@@ -4349,16 +4005,13 @@ msgstr "Organização"
 msgid "Server information"
 msgstr "Informações do servidor"
 
-#: src/prefs_account_dialog.c:665
-#: src/prefs_account_dialog.c:821
+#: src/prefs_account_dialog.c:665 src/prefs_account_dialog.c:821
 #: src/prefs_account_dialog.c:1464
 msgid "POP3"
 msgstr "POP3"
 
-#: src/prefs_account_dialog.c:667
-#: src/prefs_account_dialog.c:929
-#: src/prefs_account_dialog.c:1481
-#: src/prefs_account_dialog.c:1662
+#: src/prefs_account_dialog.c:667 src/prefs_account_dialog.c:929
+#: src/prefs_account_dialog.c:1481 src/prefs_account_dialog.c:1662
 msgid "IMAP4"
 msgstr "IMAP4"
 
@@ -4386,13 +4039,11 @@ msgstr "Servidor de recepção"
 msgid "SMTP server (send)"
 msgstr "Servidor SMTP (envio)"
 
-#: src/prefs_account_dialog.c:742
-#: src/prefs_account_dialog.c:1125
+#: src/prefs_account_dialog.c:742 src/prefs_account_dialog.c:1125
 msgid "User ID"
 msgstr "Usuario"
 
-#: src/prefs_account_dialog.c:748
-#: src/prefs_account_dialog.c:1134
+#: src/prefs_account_dialog.c:748 src/prefs_account_dialog.c:1134
 msgid "Password"
 msgstr "Senha"
 
@@ -4424,8 +4075,7 @@ msgstr "Receber todas as mensagens no servidor"
 msgid "Receive size limit"
 msgstr "Limite de tamanho de recebimento"
 
-#: src/prefs_account_dialog.c:892
-#: src/prefs_filter_edit.c:555
+#: src/prefs_account_dialog.c:892 src/prefs_filter_edit.c:555
 #: src/prefs_filter_edit.c:957
 msgid "KB"
 msgstr "KB"
@@ -4442,15 +4092,12 @@ msgstr "Caixa de Entrada Padrão"
 msgid "Unfiltered messages will be stored in this folder."
 msgstr "Mensagens não filtradas serão guardadas nesta pasta."
 
-#: src/prefs_account_dialog.c:940
-#: src/prefs_account_dialog.c:1095
+#: src/prefs_account_dialog.c:940 src/prefs_account_dialog.c:1095
 msgid "Authentication method"
 msgstr "Método de Autenticação"
 
-#: src/prefs_account_dialog.c:950
-#: src/prefs_account_dialog.c:1105
-#: src/prefs_common_dialog.c:874
-#: src/prefs_common_dialog.c:2470
+#: src/prefs_account_dialog.c:950 src/prefs_account_dialog.c:1105
+#: src/prefs_common_dialog.c:874 src/prefs_common_dialog.c:2470
 msgid "Automatic"
 msgstr "Automático"
 
@@ -4474,8 +4121,7 @@ msgstr "Sem limite se 0 for especificado."
 msgid "`Get all' checks for new messages on this account"
 msgstr "`Obter todas' confere novas mensagens nessa conta"
 
-#: src/prefs_account_dialog.c:1045
-#: src/prefs_customheader.c:186
+#: src/prefs_account_dialog.c:1045 src/prefs_customheader.c:186
 msgid "Header"
 msgstr "Cabeçalho"
 
@@ -4491,8 +4137,7 @@ msgstr "Gerar Message-ID"
 msgid "Add user-defined header"
 msgstr "Adicionar cabeçalho do usuário"
 
-#: src/prefs_account_dialog.c:1062
-#: src/prefs_common_dialog.c:1553
+#: src/prefs_account_dialog.c:1062 src/prefs_common_dialog.c:1553
 #: src/prefs_common_dialog.c:1580
 msgid " Edit... "
 msgstr " Editar... "
@@ -4506,8 +4151,12 @@ msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "Autenticação SMTP (SMTP AUTH)"
 
 #: src/prefs_account_dialog.c:1156
-msgid "If you leave these entries empty, the same user ID and password as receiving will be used."
-msgstr "Se você deixar essas entradas em branco, o mesmo ID de usuário e senha do recebimento serão usados."
+msgid ""
+"If you leave these entries empty, the same user ID and password as receiving "
+"will be used."
+msgstr ""
+"Se você deixar essas entradas em branco, o mesmo ID de usuário e senha do "
+"recebimento serão usados."
 
 #: src/prefs_account_dialog.c:1168
 msgid "Authenticate with POP3 before sending"
@@ -4517,8 +4166,7 @@ msgstr "Autenticar com POP3 antes de enviar"
 msgid "Command output"
 msgstr "Saída de comando"
 
-#: src/prefs_account_dialog.c:1235
-#: src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Estabelecer os seguintes endereços automaticamente"
 
@@ -4574,10 +4222,8 @@ msgstr "Especificar chave manualmente"
 msgid "User or key ID:"
 msgstr "Usuário ou ID da chave:"
 
-#: src/prefs_account_dialog.c:1472
-#: src/prefs_account_dialog.c:1489
-#: src/prefs_account_dialog.c:1505
-#: src/prefs_account_dialog.c:1523
+#: src/prefs_account_dialog.c:1472 src/prefs_account_dialog.c:1489
+#: src/prefs_account_dialog.c:1505 src/prefs_account_dialog.c:1523
 msgid "Don't use SSL"
 msgstr "Não usar SSL"
 
@@ -4585,8 +4231,7 @@ msgstr "Não usar SSL"
 msgid "Use SSL for POP3 connection"
 msgstr "Utilizar SSL para conexão POP3"
 
-#: src/prefs_account_dialog.c:1478
-#: src/prefs_account_dialog.c:1495
+#: src/prefs_account_dialog.c:1478 src/prefs_account_dialog.c:1495
 #: src/prefs_account_dialog.c:1529
 msgid "Use STARTTLS command to start SSL session"
 msgstr "Utilizar comando STARTTLS para iniciar a sessão SSL"
@@ -4769,22 +4414,17 @@ msgstr "Ajuda com sintaxe"
 msgid "Registered actions"
 msgstr "Ações registradas"
 
-#: src/prefs_actions.c:309
-#: src/prefs_customheader.c:278
-#: src/prefs_display_header.c:286
-#: src/prefs_summary_column.c:285
+#: src/prefs_actions.c:309 src/prefs_customheader.c:278
+#: src/prefs_display_header.c:286 src/prefs_summary_column.c:285
 msgid "Up"
 msgstr "Acima"
 
-#: src/prefs_actions.c:315
-#: src/prefs_customheader.c:284
-#: src/prefs_display_header.c:292
-#: src/prefs_summary_column.c:289
+#: src/prefs_actions.c:315 src/prefs_customheader.c:284
+#: src/prefs_display_header.c:292 src/prefs_summary_column.c:289
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/prefs_actions.c:422
-#: src/prefs_template.c:317
+#: src/prefs_actions.c:422 src/prefs_template.c:317
 msgid "(New)"
 msgstr "(Novo)"
 
@@ -4851,13 +4491,11 @@ msgstr "Detalhes"
 msgid "Auto-check new mail"
 msgstr "Checar nova mensagem"
 
-#: src/prefs_common_dialog.c:729
-#: src/prefs_common_dialog.c:1070
+#: src/prefs_common_dialog.c:729 src/prefs_common_dialog.c:1070
 msgid "every"
 msgstr "a cada"
 
-#: src/prefs_common_dialog.c:741
-#: src/prefs_common_dialog.c:1084
+#: src/prefs_common_dialog.c:741 src/prefs_common_dialog.c:1084
 msgid "minute(s)"
 msgstr "minuto(s)"
 
@@ -4873,8 +4511,7 @@ msgstr "Atualizar todas as pastas locais ao incorporar"
 msgid "Execute command when new messages arrived"
 msgstr "Executar comando quando chegarem novas mensagens"
 
-#: src/prefs_common_dialog.c:769
-#: src/prefs_common_dialog.c:2349
+#: src/prefs_common_dialog.c:769 src/prefs_common_dialog.c:2349
 #: src/prefs_common_dialog.c:2371
 msgid "Command"
 msgstr "Comando"
@@ -4910,11 +4547,14 @@ msgid "Transfer encoding"
 msgstr "Codificação para transferência"
 
 #: src/prefs_common_dialog.c:885
-msgid "Specify Content-Transfer-Encoding used when message body contains non-ASCII characters."
-msgstr "Especifique a codificação de caracteres a ser usada quando a mensagem contiver caracteres não ASCII."
+msgid ""
+"Specify Content-Transfer-Encoding used when message body contains non-ASCII "
+"characters."
+msgstr ""
+"Especifique a codificação de caracteres a ser usada quando a mensagem "
+"contiver caracteres não ASCII."
 
-#: src/prefs_common_dialog.c:950
-#: src/prefs_common_dialog.c:1338
+#: src/prefs_common_dialog.c:950 src/prefs_common_dialog.c:1338
 #: src/prefs_folder_item.c:139
 msgid "General"
 msgstr "Geral"
@@ -4984,8 +4624,7 @@ msgstr "Corretor ortográfico"
 msgid "Reply format"
 msgstr "Formato de resposta"
 
-#: src/prefs_common_dialog.c:1164
-#: src/prefs_common_dialog.c:1206
+#: src/prefs_common_dialog.c:1164 src/prefs_common_dialog.c:1206
 msgid "Quotation mark"
 msgstr "Marca de citação"
 
@@ -5044,8 +4683,7 @@ msgstr "Mostrar remetente na coluna `De' se ele for o mesmo"
 msgid "Expand threads"
 msgstr "Expandir threads"
 
-#: src/prefs_common_dialog.c:1417
-#: src/prefs_common_dialog.c:2709
+#: src/prefs_common_dialog.c:1417 src/prefs_common_dialog.c:2709
 #: src/prefs_common_dialog.c:2747
 msgid "Date format"
 msgstr "Formato de data"
@@ -5064,15 +4702,20 @@ msgstr "Codificação padrão de caracteres"
 
 #: src/prefs_common_dialog.c:1468
 msgid "This is used when displaying messages with missing character encoding."
-msgstr "Isto é usado ao exibir mensagens que não indicam a codificação de caracteres."
+msgstr ""
+"Isto é usado ao exibir mensagens que não indicam a codificação de caracteres."
 
 #: src/prefs_common_dialog.c:1474
 msgid "Outgoing character encoding"
 msgstr "Codificação de caracteres para envio"
 
 #: src/prefs_common_dialog.c:1488
-msgid "If `Automatic' is selected, the optimal encoding for the current locale will be used."
-msgstr "Se `Automático' for selecionado, a melhor codificação para o locale atual será usada."
+msgid ""
+"If `Automatic' is selected, the optimal encoding for the current locale will "
+"be used."
+msgstr ""
+"Se `Automático' for selecionado, a melhor codificação para o locale atual "
+"será usada."
 
 #: src/prefs_common_dialog.c:1549
 msgid "Enable coloration of message"
@@ -5106,8 +4749,7 @@ msgstr "Exibir cursor na área de visualização da mensagem"
 msgid "Line space"
 msgstr "Linha de espaço"
 
-#: src/prefs_common_dialog.c:1621
-#: src/prefs_common_dialog.c:1659
+#: src/prefs_common_dialog.c:1621 src/prefs_common_dialog.c:1659
 msgid "pixel(s)"
 msgstr "pixel(s)"
 
@@ -5160,8 +4802,12 @@ msgid "Classifying command"
 msgstr "Comando de classificação"
 
 #: src/prefs_common_dialog.c:1831
-msgid "To classify junk mails automatically, both junk and not junk mails must be learned manually to a certain extent."
-msgstr "Para classificar SPAM automaticamente, deve-se treinar manualmente o classificador com uma quantidade razoável de SPAM e não-SPAM."
+msgid ""
+"To classify junk mails automatically, both junk and not junk mails must be "
+"learned manually to a certain extent."
+msgstr ""
+"Para classificar SPAM automaticamente, deve-se treinar manualmente o "
+"classificador com uma quantidade razoável de SPAM e não-SPAM."
 
 #: src/prefs_common_dialog.c:1841
 msgid "Junk folder"
@@ -5237,7 +4883,8 @@ msgstr "Executar imediatamente enquanto movendo ou apagando mensagens"
 
 #: src/prefs_common_dialog.c:2076
 msgid "Messages will be marked until execution if this is turned off."
-msgstr "Mensagens permanecerão marcadas até a execução se isto estiver desativado."
+msgstr ""
+"Mensagens permanecerão marcadas até a execução se isto estiver desativado."
 
 #: src/prefs_common_dialog.c:2081
 msgid "Make the order of buttons comply with GNOME HIG"
@@ -5247,8 +4894,7 @@ msgstr "Ordenar os botões de acordo com o GNOME HIG"
 msgid " Set key bindings... "
 msgstr " Definir atalhos de teclado... "
 
-#: src/prefs_common_dialog.c:2094
-#: src/select-keys.c:344
+#: src/prefs_common_dialog.c:2094 src/select-keys.c:344
 msgid "Other"
 msgstr "Outros"
 
@@ -5317,8 +4963,7 @@ msgstr "Comandos externos (%s será sustituido pelo nome do arquivo)"
 msgid "Web browser"
 msgstr "Navegador Web"
 
-#: src/prefs_common_dialog.c:2284
-#: src/prefs_common_dialog.c:3771
+#: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
 #: src/prefs_common_dialog.c:3792
 msgid "(Default browser)"
 msgstr "(Navegador padrão)"
@@ -5337,10 +4982,12 @@ msgstr "Habilitar verificação rigorosa da integridade dos caches do sumário"
 
 #: src/prefs_common_dialog.c:2420
 msgid ""
-"Enable this if the contents of folders have the possibility of modification by other applications.\n"
+"Enable this if the contents of folders have the possibility of modification "
+"by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
-"Habilite isto se existe a possibilidade de o conteúdo das pastas ser modificado por outras aplicações.\n"
+"Habilite isto se existe a possibilidade de o conteúdo das pastas ser "
+"modificado por outras aplicações.\n"
 "Esta opção reduzirá o desempenho de exibição do sumário."
 
 # tradução boa para socket?
@@ -5663,13 +5310,11 @@ msgstr "Atalhos de teclado"
 msgid "Select the preset of key bindings."
 msgstr "Selecione o conjunto pré-definido de mapeamento de teclas."
 
-#: src/prefs_common_dialog.c:3279
-#: src/prefs_common_dialog.c:3603
+#: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
 msgid "Default"
 msgstr "Padrão"
 
-#: src/prefs_common_dialog.c:3282
-#: src/prefs_common_dialog.c:3612
+#: src/prefs_common_dialog.c:3282 src/prefs_common_dialog.c:3612
 msgid "Old Sylpheed"
 msgstr "Sylpheed antigo"
 
@@ -5677,8 +5322,7 @@ msgstr "Sylpheed antigo"
 msgid "Custom header setting"
 msgstr "Configuração de cabeçalho personalizado"
 
-#: src/prefs_customheader.c:238
-#: src/prefs_filter_edit.c:1495
+#: src/prefs_customheader.c:238 src/prefs_filter_edit.c:1495
 msgid " Delete "
 msgstr " Apagar "
 
@@ -5686,8 +5330,7 @@ msgstr " Apagar "
 msgid "Custom headers"
 msgstr "Cabeçalhos personalizados"
 
-#: src/prefs_customheader.c:351
-#: src/prefs_display_header.c:529
+#: src/prefs_customheader.c:351 src/prefs_display_header.c:529
 msgid "Header name is not set."
 msgstr "Nome do cabeçalho não definido."
 
@@ -5876,8 +5519,7 @@ msgstr "Executar comando"
 msgid "Stop rule evaluation"
 msgstr "Para avaliação de regras"
 
-#: src/prefs_filter_edit.c:669
-#: src/prefs_filter_edit.c:992
+#: src/prefs_filter_edit.c:669 src/prefs_filter_edit.c:992
 msgid "folder:"
 msgstr "pasta:"
 
@@ -5901,35 +5543,32 @@ msgstr "Cabeçalhos"
 msgid "Header:"
 msgstr "Cabeçalho:"
 
-#: src/prefs_filter_edit.c:1668
-#: src/prefs_filter_edit.c:1738
+#: src/prefs_filter_edit.c:1668 src/prefs_filter_edit.c:1738
 #: src/prefs_filter_edit.c:1745
 msgid "Command is not specified."
 msgstr "Comando não especificado."
 
-#: src/prefs_filter_edit.c:1718
-#: src/prefs_filter_edit.c:1725
+#: src/prefs_filter_edit.c:1718 src/prefs_filter_edit.c:1725
 msgid "Destination folder is not specified."
 msgstr "Pasta destino não especificada."
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "Nome da regra não especificado."
-
-#: src/prefs_filter_edit.c:1812
-#: src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "Condição inválida existe."
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "Nome da regra não especificado."
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "Ação inválida existe."
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "Condição inexistente."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "Ação inexistente."
 
@@ -5941,8 +5580,7 @@ msgstr "Propriedades da pasta"
 msgid "Identifier"
 msgstr "Identificador"
 
-#: src/prefs_folder_item.c:219
-#: src/subscribedialog.c:294
+#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Tipo"
 
@@ -5980,22 +5618,19 @@ msgid "Attachment"
 msgstr "Anexo"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73
-#: src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74
-#: src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75
-#: src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Data"
@@ -6104,8 +5739,7 @@ msgstr "\t\taka \"%s\"\n"
 msgid "Signature made at %s\n"
 msgstr "Assinatura feita em %s\n"
 
-#: src/rfc2015.c:298
-#: src/sigstatus.c:266
+#: src/rfc2015.c:298 src/sigstatus.c:266
 msgid "Error verifying the signature"
 msgstr "Erro verificando a assinatura"
 
@@ -6187,14 +5821,11 @@ msgstr "Conectando com o servidor SMTP: %s ..."
 msgid "Sending HELO..."
 msgstr "Enviando HELO..."
 
-#: src/send_message.c:622
-#: src/send_message.c:627
-#: src/send_message.c:632
+#: src/send_message.c:622 src/send_message.c:627 src/send_message.c:632
 msgid "Authenticating"
 msgstr "Autenticando"
 
-#: src/send_message.c:623
-#: src/send_message.c:628
+#: src/send_message.c:623 src/send_message.c:628
 msgid "Sending message..."
 msgstr "Enviando mensagem..."
 
@@ -6206,9 +5837,7 @@ msgstr "Enviando EHLO..."
 msgid "Sending MAIL FROM..."
 msgstr "Enviando MAIL FROM..."
 
-#: src/send_message.c:636
-#: src/send_message.c:640
-#: src/send_message.c:645
+#: src/send_message.c:636 src/send_message.c:640 src/send_message.c:645
 msgid "Sending"
 msgstr "Enviando"
 
@@ -6233,8 +5862,7 @@ msgstr "Enviando mensagem (%d / %d bytes)"
 msgid "Sending message"
 msgstr "Enviando mensagem"
 
-#: src/send_message.c:748
-#: src/send_message.c:768
+#: src/send_message.c:748 src/send_message.c:768
 msgid "Error occurred while sending the message."
 msgstr "Ocorreu um erro ao enviar suas mensagens."
 
@@ -6281,8 +5909,7 @@ msgstr "Assinatura não encontrada"
 msgid "Good signature from \"%s\""
 msgstr "Assinatura correta de \"%s\""
 
-#: src/sigstatus.c:237
-#: src/textview.c:661
+#: src/sigstatus.c:237 src/textview.c:661
 msgid "Good signature"
 msgstr "Assinatura correta"
 
@@ -6291,8 +5918,7 @@ msgstr "Assinatura correta"
 msgid "Valid signature but the key for \"%s\" is not trusted"
 msgstr "Assinatura válida mas a chave para \"%s\" não é confiável"
 
-#: src/sigstatus.c:242
-#: src/textview.c:663
+#: src/sigstatus.c:242 src/textview.c:663
 msgid "Valid signature (untrusted key)"
 msgstr "Assinatura válida (chave desconfiável)"
 
@@ -6328,8 +5954,7 @@ msgstr "Assinatura válida mas a chave foi revogada"
 msgid "BAD signature from \"%s\""
 msgstr "Assimanatura ERRADA de \"%s\""
 
-#: src/sigstatus.c:260
-#: src/textview.c:665
+#: src/sigstatus.c:260 src/textview.c:665
 msgid "BAD signature"
 msgstr "Assinatura ERRADA"
 
@@ -6399,9 +6024,7 @@ msgstr "Recebendo lista de newsgroups..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Não foi possível obter a lista de grupos de notícias."
 
-#: src/subscribedialog.c:523
-#: src/summary_search.c:518
-#: src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Feito."
 
@@ -6410,54 +6033,53 @@ msgstr "Feito."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de notícias recebidos (%s lidos)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Procurar mensagens"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "Casar qualquer um dos seguintes"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "Casar todos os seguintes"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 msgid "Folder:"
 msgstr "Pasta:"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 msgid "Search subfolders"
 msgstr "Procurar nas sub-pastas"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 msgid "_Save as search folder"
 msgstr "_Salvar como pasta de busca"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, c-format
 msgid "Searching %s ..."
 msgstr "Procurando %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Procurando %s (%d / %d)..."
 
-#: src/summary_search.c:649
-#: src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Sem data)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 msgid "Save as search folder"
 msgstr "Salvar como pasta de busca"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr "Local:"
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 msgid "Folder name:"
 msgstr "Nome da pasta:"
 
@@ -6578,8 +6200,7 @@ msgstr "Revisando pasta (%s)..."
 msgid "_Search again"
 msgstr "Procurar _novamente"
 
-#: src/summaryview.c:1228
-#: src/summaryview.c:1237
+#: src/summaryview.c:1228 src/summaryview.c:1237
 msgid "No more unread messages"
 msgstr "Não há mais mensagens não lidas"
 
@@ -6595,8 +6216,7 @@ msgstr "Não há mensagens não lidas."
 msgid "No unread message found. Go to next folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1246
-#: src/summaryview.c:1255
+#: src/summaryview.c:1246 src/summaryview.c:1255
 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 
@@ -6612,8 +6232,7 @@ msgstr "Não há mensagens novas."
 msgid "No new message found. Go to next folder?"
 msgstr "Não há mensagens novas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1264
-#: src/summaryview.c:1273
+#: src/summaryview.c:1264 src/summaryview.c:1273
 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 
@@ -6621,8 +6240,7 @@ msgstr "Não há mais mensagens marcadas"
 msgid "No marked message found. Search from the end?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1267
-#: src/summaryview.c:1276
+#: src/summaryview.c:1267 src/summaryview.c:1276
 msgid "No marked messages."
 msgstr "Não há mensagens marcadas"
 
@@ -6630,8 +6248,7 @@ msgstr "Não há mensagens marcadas"
 msgid "No marked message found. Search from the beginning?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do início?"
 
-#: src/summaryview.c:1282
-#: src/summaryview.c:1291
+#: src/summaryview.c:1282 src/summaryview.c:1291
 msgid "No more labeled messages"
 msgstr "Não há mais mensagens etiquetadas"
 
@@ -6639,8 +6256,7 @@ msgstr "Não há mais mensagens etiquetadas"
 msgid "No labeled message found. Search from the end?"
 msgstr "Não foram encontradas mensagens etiquetadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1285
-#: src/summaryview.c:1294
+#: src/summaryview.c:1285 src/summaryview.c:1294
 msgid "No labeled messages."
 msgstr "Não há mensagens etiquetadas."
 
@@ -6662,8 +6278,7 @@ msgstr "%d apagadas"
 msgid "%s%d moved"
 msgstr "%s%d movidas"
 
-#: src/summaryview.c:1772
-#: src/summaryview.c:1779
+#: src/summaryview.c:1772 src/summaryview.c:1779
 msgid ", "
 msgstr ", "
 
@@ -6762,18 +6377,15 @@ msgstr "O destino para cópia é o mesmo que a pasta atual."
 msgid "Error occurred while processing messages."
 msgstr "Erro ao processar mensagens."
 
-#: src/summaryview.c:3502
-#: src/summaryview.c:3503
+#: src/summaryview.c:3502 src/summaryview.c:3503
 msgid "Building threads..."
 msgstr "Construindo a hierarquia..."
 
-#: src/summaryview.c:3645
-#: src/summaryview.c:3646
+#: src/summaryview.c:3645 src/summaryview.c:3646
 msgid "Unthreading..."
 msgstr "Desfazendo a hierarquia..."
 
-#: src/summaryview.c:3925
-#: src/summaryview.c:3981
+#: src/summaryview.c:3925 src/summaryview.c:3981
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
@@ -6808,31 +6420,31 @@ msgstr "Criando visualização do texto...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Esta mensagem não pode ser exibida.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "_Salvar imagem como..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 msgid "Compose _new message"
 msgstr "Escrever _nova mensagem"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 msgid "Add to address _book..."
 msgstr "Adicionar ao _catálogo de endereços"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 msgid "Copy this add_ress"
 msgstr "Copiar este _endereço"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr "A_brir com o navegador Web"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "Copiar este _link"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6845,54 +6457,70 @@ msgstr ""
 "\n"
 "Abrí-la mesmo assim?"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr "Aviso de URL falsa"
 
 #~ msgid "Body:"
 #~ msgstr "Corpo:"
+
 #~ msgid "Find all"
 #~ msgstr "Encontrar todos"
+
 #~ msgid "Beginning of list reached; continue from end?"
 #~ msgstr "Inicío da lista atingido; seguir a partir do final?"
+
 #~ msgid "End of list reached; continue from beginning?"
 #~ msgstr "Chegou no fim da lista; procurar a partir do começo?"
+
 #~ msgid "Outgoing encoding"
 #~ msgstr "Codificação de envio"
+
 #~ msgid "Quote"
 #~ msgstr "Citação"
+
 #~ msgid "Font"
 #~ msgstr "Fonte"
+
 #~ msgid " [Edited]"
 #~ msgstr " [Editado]"
 
 #, fuzzy
 #~ msgid "Fallback encoding"
 #~ msgstr "Codificação de nome de arquivo"
+
 #~ msgid "Terminated process group id: %d"
 #~ msgstr "Terminado grupo de processo id.: %d"
+
 #~ msgid "Temporary file: %s"
 #~ msgstr "Arquivo temporário: %s"
+
 #~ msgid "Compose: input from monitoring process\n"
 #~ msgstr "Compositor: entrada para monitorar processo\n"
+
 #~ msgid "Couldn't exec external editor\n"
 #~ msgstr "Não foi possível executar o editor externo\n"
+
 #~ msgid "Couldn't write to file\n"
 #~ msgstr "Não foi possível gravar o arquivo\n"
+
 #~ msgid "Pipe read failed\n"
 #~ msgstr "Erro ao ler do pipe\n"
+
 #~ msgid ""
 #~ "Filtered messages will be moved to the junk folder and deleted from the "
 #~ "server."
 #~ msgstr ""
 #~ "Mensagens filtradas serão movidas para a pasta de spam e apagadas do "
 #~ "servidor."
+
 #~ msgid ""
 #~ "Enter the print command line:\n"
 #~ "(`%s' will be replaced with file name)"
 #~ msgstr ""
 #~ "Digite o comando de impressão:\n"
 #~ "(`%s' será sustituído pelo arquivo)"
+
 #~ msgid ""
 #~ "First, you have to set the location of mailbox.\n"
 #~ "You can use existing mailbox in MH format\n"
@@ -6903,6 +6531,7 @@ msgstr "Aviso de URL falsa"
 #~ "Você pode usar uma cixa de correio existente em formato MH\n"
 #~ "caso você possua uma.\n"
 #~ "Caso voê não tenha certeza, somente selecione OK."
+
 #~ msgid ""
 #~ "Select the preset of key bindings.\n"
 #~ "You can also modify each menu's shortcuts by pressing\n"
@@ -6912,108 +6541,156 @@ msgstr "Aviso de URL falsa"
 #~ "Você pode também modificar o atalho para cada menu\n"
 #~ "pressionando qualquer tecla enquanto coloca o ponteiro\n"
 #~ "do mouse sobre o item."
+
 #~ msgid "Compose message%s"
 #~ msgstr "Compondo mensagem%s"
+
 #~ msgid "Translate header name (such as `From:', `Subject:')"
 #~ msgstr "Traduzir cabeçalhos (como `De:', `Assunto:')"
+
 #~ msgid "Font selection"
 #~ msgstr "Seleção de fonte"
+
 #~ msgid "Empty messages in all trash?"
 #~ msgstr "Limpar todas as mensagens da lixeira?"
+
 #~ msgid "Yes"
 #~ msgstr "Sim"
+
 #~ msgid "+No"
 #~ msgstr "+Não"
+
 #~ msgid "Discard message"
 #~ msgstr "Descartar mensagem"
+
 #~ msgid "Discard"
 #~ msgstr "Descartar"
+
 #~ msgid "to Draft"
 #~ msgstr "Rascunho"
+
 #~ msgid "can't write headers\n"
 #~ msgstr "não foi possível escrever o cabeçalho\n"
+
 #~ msgid "External program"
 #~ msgstr "Programa externo"
+
 #~ msgid "Local spool"
 #~ msgstr "Spool local"
+
 #~ msgid "Sending queued message %d failed.\n"
 #~ msgstr "Falha ao enviar a mensagen %d.\n"
+
 #~ msgid "Backward search"
 #~ msgstr "Procurar para trás"
+
 #~ msgid "Select all matched"
 #~ msgstr "Selecionar todos que combinam (match)"
+
 #~ msgid "M"
 #~ msgstr "x"
+
 #~ msgid "U"
 #~ msgstr "N"
+
 #~ msgid "Selecting all messages..."
 #~ msgstr "Selecionando todas as mensagens"
+
 #~ msgid "Unthreading for execution..."
 #~ msgstr "Desfazendo a hierarquia para a execução..."
+
 #~ msgid "/_Edit/A_dvanced"
 #~ msgstr "/_Editar/_Avançado"
+
 #~ msgid "/_Edit/A_dvanced/Move a character backward"
 #~ msgstr "/_Editar/_Avançado/Mover um caractere para trás"
+
 #~ msgid "/_Edit/A_dvanced/Move a character forward"
 #~ msgstr "/_Editar/_Avançado/Mover um caractere para frente"
+
 #~ msgid "/_Edit/A_dvanced/Move a word backward"
 #~ msgstr "/_Editar/_Avançado/Mover uma palavra para a trás"
+
 #~ msgid "/_Edit/A_dvanced/Move a word forward"
 #~ msgstr "/_Editar/_Avançado/Mover uma palavra para frente"
+
 #~ msgid "/_Edit/A_dvanced/Move to beginning of line"
 #~ msgstr "/_Editar/_Avançado/Mover para o início da linha"
+
 #~ msgid "/_Edit/A_dvanced/Move to end of line"
 #~ msgstr "/_Editar/_Avançado/Mover para o fim da linha"
+
 #~ msgid "/_Edit/A_dvanced/Move to previous line"
 #~ msgstr "/_Editar/_Avançado/Mover para a linha anterior"
+
 #~ msgid "/_Edit/A_dvanced/Move to next line"
 #~ msgstr "/_Editar/_Avançado/Mover para a próxima linha"
+
 #~ msgid "/_Edit/A_dvanced/Delete a character backward"
 #~ msgstr "/_Editar/_Avançado/Apagar um caractere para trás"
+
 #~ msgid "/_Edit/A_dvanced/Delete a character forward"
 #~ msgstr "/_Editar/_Avançado/Apagar um caractere para frente"
+
 #~ msgid "/_Edit/A_dvanced/Delete a word backward"
 #~ msgstr "/_Editar/_Avançado/Apagar uma palavra para trás"
+
 #~ msgid "/_Edit/A_dvanced/Delete a word forward"
 #~ msgstr "/_Editar/_Avançado/Apagar uma palavra para frente"
+
 #~ msgid "/_Edit/A_dvanced/Delete line"
 #~ msgstr "/_Editar/_Avançado/Apagar linha"
+
 #~ msgid "/_Edit/A_dvanced/Delete to end of line"
 #~ msgstr "/_Editar/_Avançado/Apagar até o fim da linha"
+
 #~ msgid "Rebuilding all folder trees..."
 #~ msgstr "Revisando todas as árvores de pastas..."
+
 #~ msgid "/_View/_Code set/---"
 #~ msgstr "/E_xibir/Conjunto de ca_racteres/---"
+
 #~ msgid "/_View/_Code set"
 #~ msgstr "/E_xibir/Conjunto de ca_racteres"
+
 #~ msgid "To save this part, pop up the context menu with "
 #~ msgstr "Para salvar esta parte, abra o menu contextual com o"
+
 #~ msgid "right click and select `Save as...', "
 #~ msgstr "botão direito e selecione `Salvar como...' "
+
 #~ msgid ""
 #~ "or press `y' key.\n"
 #~ "\n"
 #~ msgstr ""
 #~ "ou tecle `y'.\n"
 #~ "\n"
+
 #~ msgid "To display this part as a text message, select "
 #~ msgstr "Para ver esta parte como uma mensagem de texto, selecione"
+
 #~ msgid ""
 #~ "`Display as text', or press `t' key.\n"
 #~ "\n"
 #~ msgstr ""
 #~ "`Exibir como texto', ou tecle `t'.\n"
 #~ "\n"
+
 #~ msgid "To open this part with external program, select "
 #~ msgstr "Para abrir esta parte com um programa externo, selecione"
+
 #~ msgid "`Open' or `Open with...', "
 #~ msgstr "`Abrir' ou `Abrir com...'. "
+
 #~ msgid "or double-click, or click the center button, "
 #~ msgstr "ou duplo-clique, ou clique com o botão do meio, "
+
 #~ msgid "or press `l' key."
 #~ msgstr "ou pressione `l'."
+
 #~ msgid "To check it, pop up the context menu with\n"
 #~ msgstr "Para checá-la, abra o menu de contexto com\n"
+
 #~ msgid "right click and select `Check signature'.\n"
 #~ msgstr "um clique do botão direito e selecione `Checar assinatura'.\n"
 
@@ -7024,150 +6701,213 @@ msgstr "Aviso de URL falsa"
 #, fuzzy
 #~ msgid "Copy"
 #~ msgstr "/_Copiar..."
+
 #~ msgid "OK"
 #~ msgstr "Aceitar"
+
 #~ msgid "Close"
 #~ msgstr "Fechar"
+
 #~ msgid "Cancel"
 #~ msgstr "Cancelar"
+
 #~ msgid "No"
 #~ msgstr "Não"
+
 #~ msgid "Refresh"
 #~ msgstr "Atualizar"
+
 #~ msgid "Search"
 #~ msgstr "Procurar"
+
 #~ msgid "Apply"
 #~ msgstr "Aplicar"
+
 #~ msgid "Oops: Signature not verified"
 #~ msgstr "Oops: Assinatura não verificada"
+
 #~ msgid "Different results for signatures"
 #~ msgstr "Resultados diferentes para assinaturas"
+
 #~ msgid "Error: Unknown status"
 #~ msgstr "Erro: Status desconhecido"
+
 #~ msgid "                aka \"%s\"\n"
 #~ msgstr "\t\t\t\t\t\tconhecido como \"%s\"\n"
+
 #~ msgid "Key fingerprint: %s\n"
 #~ msgstr "Chave fingerprint: %s\n"
+
 #~ msgid "Found label: %s\n"
 #~ msgstr "Texto encontrado: %s\n"
+
 #~ msgid "Reading configuration...\n"
 #~ msgstr "Lendo configuração...\n"
+
 #~ msgid "Finished reading configuration.\n"
 #~ msgstr "Terminada a leitura da configuração.\n"
+
 #~ msgid "Leave space on head"
 #~ msgstr "Deixar espaço do cabeçalho"
+
 #~ msgid "Abcdef"
 #~ msgstr "Abcdef"
+
 #~ msgid "Can't open file %s\n"
 #~ msgstr "Não foi possível abrir %s\n"
+
 #~ msgid "POP3 (normal)"
 #~ msgstr "POP3 (normal)"
+
 #~ msgid "POP3 (APOP auth)"
 #~ msgstr "POP3 (autoriz. APOP)"
+
 #~ msgid "/Remove _mailbox"
 #~ msgstr "/Remover _caixa de correio"
+
 #~ msgid "/Remove _IMAP4 account"
 #~ msgstr "/Remover conta _IMAP4"
+
 #~ msgid "/Remove _news account"
 #~ msgstr "/_Eliminar grupo de notícias"
+
 #~ msgid "/_Message/_Send"
 #~ msgstr "/_Mensagem/_Enviar"
+
 #~ msgid "/_Message/Si_gn"
 #~ msgstr "/_Mensagem/As_sinar"
+
 #~ msgid "no messages in local mailbox.\n"
 #~ msgstr "não há mensagens no caixa de correio local.\n"
 
 #, fuzzy
 #~ msgid "Select..."
 #~ msgstr "Selecionar..."
+
 #~ msgid "Condition"
 #~ msgstr "Condição"
+
 #~ msgid "Keyword"
 #~ msgstr "Palavra-chave"
+
 #~ msgid "Destination"
 #~ msgstr "Destino"
+
 #~ msgid "Use regex"
 #~ msgstr "Usar exp.reg."
+
 #~ msgid "Registered rules"
 #~ msgstr "Regras registradas"
+
 #~ msgid "(none)"
 #~ msgstr "(nenhuma)"
+
 #~ msgid "Open URI command line is invalid: `%s'"
 #~ msgstr "O comando de abertura de URI é inválido: `%s'"
+
 #~ msgid "Cache data is corrupted\n"
 #~ msgstr "Dados do cache estão corrompidos\n"
+
 #~ msgid "Queueing"
 #~ msgstr "Armazenando"
+
 #~ msgid ""
 #~ "Error occurred while sending the message.\n"
 #~ "Put this message into queue folder?"
 #~ msgstr ""
 #~ "Ocorreu um erro ao enviar as mensagens.\n"
 #~ "Deseja por esta mensagem na 'Fila de Saída'?"
+
 #~ msgid "Queue messages that fail to send"
 #~ msgstr "Por na fila os e-mails que falharam"
+
 #~ msgid "/E_xecute"
 #~ msgstr "/E_xecutar"
+
 #~ msgid "/Select _all"
 #~ msgstr "/_Selecionar tudo"
+
 #~ msgid "/Select t_hread"
 #~ msgstr "/_Selecionar t_hread"
+
 #~ msgid "can't set group: %s\n"
 #~ msgstr "não foi possível estabelecer o grupo: %s\n"
+
 #~ msgid "a message won't be received\n"
 #~ msgstr "uma mensagem não será recebida\n"
+
 #~ msgid "\tNo cache file\n"
 #~ msgstr "\tNão há arquivo de cache\n"
+
 #~ msgid "\tReading summary cache..."
 #~ msgstr "\tLendo cache de sumários..."
+
 #~ msgid "Cache version is different. Discarding it.\n"
 #~ msgstr "A versão em cache é diferente. Descartando-a.\n"
+
 #~ msgid "Mark file not found.\n"
 #~ msgstr "Arquivo de marcas não encontrado.\n"
+
 #~ msgid "Mark version is different (%d != %d). Discarding it.\n"
 #~ msgstr "Versão de marca diferente (%d != %d). Discartando-a.\n"
+
 #~ msgid "Can't open mark file with append mode.\n"
 #~ msgstr "Não foi possível abrir o arquivo de marcas para dição.\n"
+
 #~ msgid "Can't open mark file with write mode.\n"
 #~ msgstr "Não foi possível abrir o arquivo de marcas para gravação.\n"
 
 #, fuzzy
 #~ msgid "can't create root folder %s\n"
 #~ msgstr "não foi possível criar o arquivo de trava %s\n"
+
 #~ msgid ""
 #~ "empty folder\n"
 #~ "\n"
 #~ msgstr ""
 #~ "pasta vazia\n"
 #~ "\n"
+
 #~ msgid "Only if a window is active"
 #~ msgstr "Somente se uma janela estiver ativa"
+
 #~ msgid ""
 #~ "All previous settings for each folders will be lost.\n"
 #~ "Continue?"
 #~ msgstr ""
 #~ "Todas as configurações prévias para cada pasta serão perdidas.\n"
 #~ "Continuar?"
+
 #~ msgid "window position: x = %d, y = %d\n"
 #~ msgstr "posição da janela: x = %d, y = %d\n"
+
 #~ msgid "Setting widgets..."
 #~ msgstr "Configurando widgets..."
+
 #~ msgid "\tMarking the messages..."
 #~ msgstr "\tMarcando as mensagens..."
+
 #~ msgid "\t%d new message(s)\n"
 #~ msgstr "\t%d nova(s) mensagem(ns)\n"
+
 #~ msgid "can't select mailbox %s\n"
 #~ msgstr "não foi possível selecionar a caixa de correio %s\n"
+
 #~ msgid "getting message %d...\n"
 #~ msgstr "obtendo mensagem %d...\n"
+
 #~ msgid "Deleting cached messages %u - %u ... "
 #~ msgstr "Apagando mensagens no cache %u - %u ... "
+
 #~ msgid "Deleting all cached messages... "
 #~ msgstr "\tApagando todas as mensagens no cache... "
+
 #~ msgid "Counting total number of messages...\n"
 #~ msgstr "Contando número total de mensagens...\n"
+
 #~ msgid "Could not get message file."
 #~ msgstr "Não foi possível ler o arquivo de mensagem."
+
 #~ msgid "Open message when cursor keys are pressed on summary"
 #~ msgstr "Abrir mensagem quando teclas de cursor são pressionadas no resumo"
 
@@ -7176,132 +6916,192 @@ msgstr "Aviso de URL falsa"
 #~ "Error occurred while sending mail:\n"
 #~ "%s"
 #~ msgstr "Ocorreu um erro enquanto as mensagens eram processadas."
+
 #~ msgid "Some errors occurred while sending queued messages."
 #~ msgstr "Ocorreram erros ao enviar mensagens da fila."
+
 #~ msgid "No message part selected."
 #~ msgstr "Não há parte selecionada na mensagem."
+
 #~ msgid "Predicate"
 #~ msgstr "Predicado"
+
 #~ msgid "Creating actions setting window...\n"
 #~ msgstr "Criando janela de configuração de ações...\n"
+
 #~ msgid "Actions setting"
 #~ msgstr "Configuraçãoes das Ações"
+
 #~ msgid "Reading actions configurations...\n"
 #~ msgstr "lendo configurações das ações...\n"
+
 #~ msgid "Action command error\n"
 #~ msgstr "Erro no comando da ação\n"
+
 #~ msgid "Forking child and grandchild.\n"
 #~ msgstr "Chamando processo filho e net.\n"
+
 #~ msgid "Child: Waiting for grandchild\n"
 #~ msgstr "Filho: Esperando por neto\n"
+
 #~ msgid "Child: grandchild ended\n"
 #~ msgstr "Filho: neto terminou\n"
+
 #~ msgid "Killing child group id %d\n"
 #~ msgstr "Matando filho de id de grupo %d\n"
+
 #~ msgid "Freeing children data %p\n"
 #~ msgstr "Liberando dados do filho %p\n"
+
 #~ msgid "Updating actions input/output dialog.\n"
 #~ msgstr "Atualizando o diálogo de entrada/saída das ações.\n"
+
 #~ msgid "Child returned %c\n"
 #~ msgstr "Filho retornou %c\n"
+
 #~ msgid "Sending input to grand child.\n"
 #~ msgstr "Enviando entrada para neto.\n"
+
 #~ msgid "Input to grand child sent.\n"
 #~ msgstr "Entrada enviada para neto.\n"
+
 #~ msgid "Catching grand child's output.\n"
 #~ msgstr "Pegando saída do neto.\n"
+
 #~ msgid "Socket error\n"
 #~ msgstr "erro de socket\n"
+
 #~ msgid "Account not found. Using current account...\n"
 #~ msgstr "Conta não encontrada. Usando conta corrente...\n"
+
 #~ msgid "Account not found.\n"
 #~ msgstr "Conta não encontrada\n"
+
 #~ msgid "SMTP AUTH failed\n"
 #~ msgstr "SMTP AUTH falhou\n"
+
 #~ msgid "Error occurred while sending QUIT\n"
 #~ msgstr "Ocorreu um erro ao enviar o QUIT\n"
+
 #~ msgid "Can't connect to SMTP server: %s:%d\n"
 #~ msgstr "Não foi possível se conectar com o servidor SMTP: %s:%d\n"
+
 #~ msgid "SSL connection failed"
 #~ msgstr "Falha na conexão SSL"
+
 #~ msgid "Error occurred while connecting to %s:%d\n"
 #~ msgstr "Ocorreu um erro ao conectar em %s:%d\n"
+
 #~ msgid "Error occurred while sending HELO\n"
 #~ msgstr "Ocorreu um erro enviando HELO\n"
+
 #~ msgid "Error occurred while sending STARTTLS\n"
 #~ msgstr "Ocorreu um erro ao enviar o STARTTLS\n"
+
 #~ msgid "Error occurred while sending EHLO\n"
 #~ msgstr "Ocorreu um erro ao enviar o EHLO\n"
+
 #~ msgid "Signature file"
 #~ msgstr "Arquivo de assinatura"
+
 #~ msgid "Creating custom header setting window...\n"
 #~ msgstr "Criando janela de configuração de cabeçalhos personalizados...\n"
+
 #~ msgid "Reading custom header configuration...\n"
 #~ msgstr "Lendo configuração dos cabeçalhos personalizados...\n"
+
 #~ msgid "Writing custom header configuration...\n"
 #~ msgstr "Gravando configuração dos cabeçalhos personalizados...\n"
+
 #~ msgid "Creating filter setting window...\n"
 #~ msgstr "Criando janela de configuração de filtros...\n"
+
 #~ msgid "Reading filter configuration...\n"
 #~ msgstr "Lendo configuração dos filtros...\n"
+
 #~ msgid "Writing filter configuration...\n"
 #~ msgstr "Gravando configuração dos filtros...\n"
+
 #~ msgid "\tSearching uncached messages... "
 #~ msgstr "\tProcurando mensagens não cacheadas..."
+
 #~ msgid "%d uncached message(s) found.\n"
 #~ msgstr "Encontrada(s) %d mensagen(s) não cacheada(s).\n"
+
 #~ msgid "\tSorting uncached messages in numerical order... "
 #~ msgstr "\tOrdenando mensagens não cacheadas numericamente..."
+
 #~ msgid "forced charset: %s\n"
 #~ msgstr "conjunto de caracteres forçado: %s\n"
+
 #~ msgid "Enable horizontal scroll bar"
 #~ msgstr "Habilitar barra de rolagem horizontal"
+
 #~ msgid "Display unread messages with bold font"
 #~ msgstr "Mostrar mensagens não lidas com fonte em negrito"
 
 #, fuzzy
 #~ msgid "Finished"
 #~ msgstr "Terminar"
+
 #~ msgid "Done"
 #~ msgstr "Feito"
 
 #, fuzzy
 #~ msgid "Checking all folders for new messages..."
 #~ msgstr "/_Buscar novas mensagens"
+
 #~ msgid "/_File/_Rescan folder tree"
 #~ msgstr "/_Arquivo/Atualizar árvore de _pastas"
+
 #~ msgid "move_file(): file %s already exists."
 #~ msgstr "move_file(): arquivo %s já existe."
+
 #~ msgid "%s:%d loading template from %s\n"
 #~ msgstr "%s:%d carregando modelo de %s\n"
+
 #~ msgid "%s:%d reading templates dir %s\n"
 #~ msgstr "%s:%d lendo o diretório de modelos %s\n"
+
 #~ msgid "%s:%d found file %s\n"
 #~ msgstr "%s:%d encontrou arquivo %s\n"
+
 #~ msgid "%s:%d %s is not an ordinary file\n"
 #~ msgstr "%s:%d %s não é um arquivo comum\n"
+
 #~ msgid "%s:%d writing template \"%s\" to %s\n"
 #~ msgstr "%s:%d escrevendo modelo \\\"%s\\\" para %s\n"
+
 #~ msgid "saving sent message...\n"
 #~ msgstr "guardando mensagem enviada...\n"
+
 #~ msgid "can't save message\n"
 #~ msgstr "não foi possível salvar a mensagem\n"
+
 #~ msgid "Creating actions dialog\n"
 #~ msgstr "Criando diálogo das ações...\n"
+
 #~ msgid "Close window"
 #~ msgstr "Fechar janela"
+
 #~ msgid "Creating log window...\n"
 #~ msgstr "Criando janela de log...\n"
+
 #~ msgid "Deleting cached articles 1 - %d ... "
 #~ msgstr "Apagando artigos em cache 1 - %d ... "
+
 #~ msgid "\tDeleting all cached articles... "
 #~ msgstr "\tApagando artigos em cache... "
+
 #~ msgid "/_Help/_Manual/_French"
 #~ msgstr "/_Ajuda/_Manual/_Francês"
+
 #~ msgid "/_Help/_Manual/_German"
 #~ msgstr "/_Ajuda/_Manual/_Alemão"
+
 #~ msgid "/_Help/_Manual/_Spanish"
 #~ msgstr "/_Ajuda/_Manual/_Espanhol"
+
 #~ msgid ""
 #~ "The portions applied from fetchmail is Copyright 1997 by Eric S. "
 #~ "Raymond.  Portions of those are also copyrighted by Carl Harris, 1993 and "
@@ -7314,6 +7114,7 @@ msgstr "Aviso de URL falsa"
 #~ "O Copyright é protegido com o propósito de proteger a livre "
 #~ "distribuição \n"
 #~ "dos fontes.\n"
+
 #~ msgid ""
 #~ "Kcc is copyright by Yasuhiro Tonooka <tonooka@msi.co.jp>, and libkcc is "
 #~ "copyright by takeshi@SoftAgency.co.jp.\n"
@@ -7322,132 +7123,190 @@ msgstr "Aviso de URL falsa"
 #~ "Kcc é copyright de Yasuhiro Tonooka <tonooka@msi.co.jp>, e libkcc é "
 #~ "copyright de takeshi@SoftAgency.co.jp.\n"
 #~ "\n"
+
 #~ msgid "can't allocate memory\n"
 #~ msgstr "Falha ao alocar memória\n"
+
 #~ msgid "/_View/Toggle summary _view"
 #~ msgstr "/E_xibir/_Alternar visão de resumo"
+
 #~ msgid "%s already exists."
 #~ msgstr "%s já existe."
+
 #~ msgid "Really delete folder `%s'?"
 #~ msgstr "Realmente apagar pasta `%s'?"
 
 #, fuzzy
 #~ msgid "Error occurred while %s\n"
 #~ msgstr "Ocorreu um erro quando postando\n"
+
 #~ msgid "/_Tool"
 #~ msgstr "/_Ferramentas"
+
 #~ msgid "Outbox"
 #~ msgstr "Caixa de Saída"
 
 #, fuzzy
 #~ msgid "Skipping message %d\n"
 #~ msgstr "obtendo mensagem %d...\n"
+
 #~ msgid "Creating header window...\n"
 #~ msgstr "Criando janela de cabeçalhos...\n"
+
 #~ msgid "Displaying the header of %s ...\n"
 #~ msgstr "Exibindo cabeçalhos de %s ...\n"
+
 #~ msgid "%s - All header"
 #~ msgstr "%s - Todos os cabeçalhos"
+
 #~ msgid "/_View/U_nthread view"
 #~ msgstr "/E_xibir/Visão sem t_hreads"
+
 #~ msgid "External Web browser (%s will be replaced with URI)"
 #~ msgstr "Visualizador web externo (%s será sustituido pela URL)"
+
 #~ msgid "Printing (%s will be replaced with file name)"
 #~ msgstr "Impressão (%s será sustituido pelo nome do arquivo)"
+
 #~ msgid "Go to %s\n"
 #~ msgstr "Ir para %s\n"
+
 #~ msgid "Operator"
 #~ msgstr "Operador"
+
 #~ msgid "/_Message/_To"
 #~ msgstr "/_Mensagem/ _Para"
+
 #~ msgid "/_Message/_Cc"
 #~ msgstr "/_Mensagem/_Cc"
+
 #~ msgid "/_Message/_Bcc"
 #~ msgstr "/_Mensagem/_Bcc"
+
 #~ msgid "/_Message/_Attach"
 #~ msgstr "/_Mensagem/_Anexar"
+
 #~ msgid "/_Tool/Show _ruler"
 #~ msgstr "/_Ferramentas/E_xibir régua"
+
 #~ msgid "/_Update folder tree"
 #~ msgstr "/_Arquivo/_Atualizar árvore de diretórios"
+
 #~ msgid "/_Edit/_Search folder"
 #~ msgstr "/_Editar/_Procurar pasta"
+
 #~ msgid "Wrap current paragraph"
 #~ msgstr "Quebrar parágrafo atual"
+
 #~ msgid "/_Message/Add sender to address boo_k"
 #~ msgstr "/_Mensagem/Adicionar remetente ao Li_vro de Endereços"
+
 #~ msgid "/_Summary"
 #~ msgstr "/_Resumo"
+
 #~ msgid "/_Summary/E_xecute"
 #~ msgstr "/_Resumo/_Executar"
+
 #~ msgid "/_Summary/_Update"
 #~ msgstr "/_Resumo/A_tualizar"
+
 #~ msgid "/_Summary/---"
 #~ msgstr "/_Resumo/---"
+
 #~ msgid "/_Summary/Go _to"
 #~ msgstr "/_Resumo/Ir _Para"
+
 #~ msgid "/_Summary/Go _to/---"
 #~ msgstr "/_Resumo/Ir _Para/---"
+
 #~ msgid "/_Summary/_Sort"
 #~ msgstr "/_Resumo/_Ordenar"
+
 #~ msgid "/_Summary/_Sort/---"
 #~ msgstr "/_Resumo/_Ordenar/---"
+
 #~ msgid "/_Summary/_Thread view"
 #~ msgstr "/_Resumo/_Visualização hierárquica"
+
 #~ msgid "/_Summary/Unt_hread view"
 #~ msgstr "/_Resumo/Visualização nor_mal"
+
 #~ msgid "The newsgroup `%s' already exists."
 #~ msgstr "O grupo de notícias `%s' já existe."
+
 #~ msgid "Input subscribing newsgroup:"
 #~ msgstr "Informe o nome do grupo de notícias a se inscrever:"
+
 #~ msgid "Quotation format:"
 #~ msgstr "Formato da citação:"
+
 #~ msgid "Updating all folders..."
 #~ msgstr "Atualizando todas as pastas"
+
 #~ msgid "Set display item"
 #~ msgstr "Indicar elemento visual"
+
 #~ msgid "MIME"
 #~ msgstr "MIME"
+
 #~ msgid "Preferences for each account"
 #~ msgstr "Preferências para cada conta"
+
 #~ msgid "each"
 #~ msgstr "cada"
+
 #~ msgid "/View so_urce"
 #~ msgstr "/Ver _fonte"
+
 #~ msgid "/Show all _header"
 #~ msgstr "/_Mostrar todos os cabeçalhos"
+
 #~ msgid "Current folder is Trash."
 #~ msgstr "A pasta atual é a Lixeira."
+
 #~ msgid "Reading addressbook file..."
 #~ msgstr "Lendo livro de endereços..."
+
 #~ msgid "%s doesn't exist.\n"
 #~ msgstr "%s não existe.\n"
+
 #~ msgid "Exporting addressbook to file..."
 #~ msgstr "Exportando livro de endereços..."
+
 #~ msgid "failed to write addressbook data.\n"
 #~ msgstr "Falhou ao gravar o livro de endereços.\n"
+
 #~ msgid "The name already exists."
 #~ msgstr "Este nome já existe."
+
 #~ msgid "New group"
 #~ msgstr "Novo grupo"
+
 #~ msgid "Input the name of new group:"
 #~ msgstr "Nome do novo grupo:"
+
 #~ msgid "Input the new name of group:"
 #~ msgstr "Nome do novo grupo:"
+
 #~ msgid "/_Message/Show all _header"
 #~ msgstr "/_Mensagem/Mo_strar todos os cabeçalhos"
+
 #~ msgid "Sending queued message failed."
 #~ msgstr "Falhou enviando mensagens da fila."
+
 #~ msgid "Current account: %s"
 #~ msgstr "Conta atual: %s"
+
 #~ msgid ""
 #~ "Emulate the behavior of mouse operation of\n"
 #~ "Emacs-based mailer"
 #~ msgstr ""
 #~ "Emular o comportamento de operações de mouse como\n"
 #~ "em clientes de e-mail baseados no Emacs"
+
 #~ msgid "Authorizing..."
 #~ msgstr "Autorizando..."
+
 #~ msgid ""
 #~ "Ordinary characters placed in the format string are copied without "
 #~ "conversion. Conversion specifiers are introduced by a % character, and "
@@ -7494,28 +7353,40 @@ msgstr "Aviso de URL falsa"
 #~ "%y: os últimos dois dígitos de um ano\n"
 #~ "%Y: o ano como um número decimal\n"
 #~ "%Z: a zone de tempo como um nome ou abreviação"
+
 #~ msgid "done."
 #~ msgstr "concluído."
+
 #~ msgid "/_Message/_Acompanhar"
 #~ msgstr "/_Mensagem/ E_ncaminhar para"
+
 #~ msgid "can't get the next uid of folder: %s\n"
 #~ msgstr "não foi possível obter o próximo uid da pasta: %s\n"
+
 #~ msgid "/Remove _news server"
 #~ msgstr "/_Apagar servidor de notícias"
+
 #~ msgid "Really delete news server `%s'?"
 #~ msgstr "Realmente apagar o servidor de notícias `%s'?"
+
 #~ msgid "/_View/_Toolbar/_Non-display"
 #~ msgstr "/E_xibir/_Barra de Ferramentas/_Ocultar"
+
 #~ msgid "/_Message/_Mark/Mark it as _being read"
 #~ msgstr "/_Mensagem/_Marcar/Marcar como _lida"
+
 #~ msgid "deleting article %d...\n"
 #~ msgstr "apagando artigo %d...\n"
+
 #~ msgid "/_Mark/Make it as _being read"
 #~ msgstr "/_Marcar/Marcar como _lida"
+
 #~ msgid "Show other headers"
 #~ msgstr "Mostrar outros cabeçalhos"
+
 #~ msgid "Receive at getting from all accounts"
 #~ msgstr "Receber de todas as contas"
+
 #~ msgid ""
 #~ "The MD5 support is copyright by RSA Data Security, Inc.  See the header "
 #~ "comment of the md5.c module for license terms.\n"
@@ -7524,76 +7395,112 @@ msgstr "Aviso de URL falsa"
 #~ "O suporte à MD5 é copyright da RSA Data Security, Inc. Veja os "
 #~ "comentários no início do módulo md5.c para os termos da licença.\n"
 #~ "\n"
+
 #~ msgid "SunMonTueWedThuFriSat"
 #~ msgstr "DomSegTerQuaQuiSexSab"
+
 #~ msgid "/_Summary/Select a_ll"
 #~ msgstr "/_Resumo/_Selecionar todos"
+
 #~ msgid "Clean trash"
 #~ msgstr "Limpar lixeira"
+
 #~ msgid "/_Mark/Mark as _important"
 #~ msgstr "/_Marcar/Marcar como _importante"
+
 #~ msgid "TextView: color allocation failed\n"
 #~ msgstr "TextView: falhou ao alocar cores\n"
+
 #~ msgid "*** Warning: code conversion failed ***\n"
 #~ msgstr "*** Warning: Erro ao converter conjunto de caracteres ***\n"
+
 #~ msgid "Invalid MIME type\n"
 #~ msgstr "Tipo MIME inválido\n"
+
 #~ msgid "%s - Compose message [Edited]"
 #~ msgstr "%s - Compondo mensagem [Editada]"
+
 #~ msgid "deleting folder %s ...\n"
 #~ msgstr "apagando pasta %s ...\n"
+
 #~ msgid "Input adding news server:"
 #~ msgstr "Nome do servidor de notícias:"
+
 #~ msgid "The news server `%s' already exists."
 #~ msgstr "O servidor de notícias `%s' já existe."
+
 #~ msgid "deleting cache folder of %s ...\n"
 #~ msgstr "apagando pasta de cache %s ...\n"
+
 #~ msgid "IMAP login command is invalid.\n"
 #~ msgstr "Comando IMAP de login inválido.\n"
+
 #~ msgid "Next unread"
 #~ msgstr "Próxima não lida"
+
 #~ msgid "New directory"
 #~ msgstr "Novo diretório"
+
 #~ msgid "The directory not found. Create it?"
 #~ msgstr "Diretório não encontrado. Criá-lo?"
+
 #~ msgid "Can't create directory."
 #~ msgstr "Não foi possível criar o diretório."
+
 #~ msgid "Selected name isn't a directory."
 #~ msgstr "O nome selecionado não é um diretório."
+
 #~ msgid "Writing mail folder list..."
 #~ msgstr "Gravando lista de pastas de correio..."
+
 #~ msgid "Writing imap folder list..."
 #~ msgstr "Gravando lista de pastas imap..."
+
 #~ msgid "Writing news folder list..."
 #~ msgstr "Gravando lista das pastas de notícias..."
+
 #~ msgid "Mail Server (IMAP4)"
 #~ msgstr "Servidor de Correio (IMAP4)"
+
 #~ msgid "NetNews"
 #~ msgstr "Notícias"
+
 #~ msgid "reading folder list %s ..."
 #~ msgstr "lendo lista de pastas %s ..."
+
 #~ msgid "Broken folder list cache.\n"
 #~ msgstr "Cache da lista de pastas corrompido.\n"
+
 #~ msgid "Select destination directory"
 #~ msgstr "Selecionar diretório de destino"
+
 #~ msgid "can't drop message into %s\n"
 #~ msgstr "não foi possível guardar a mensagem em %s\n"
+
 #~ msgid "%s exists\n"
 #~ msgstr "%s existe\n"
+
 #~ msgid "can't move tmpmsg to %s\n"
 #~ msgstr "não foi possível renomear tmpmsg para %s\n"
+
 #~ msgid "IMAP session is not established\n"
 #~ msgstr "sesão IMAP não estabelecida\n"
+
 #~ msgid "news session is not established\n"
 #~ msgstr "sessão de notícias não estabelecida\n"
+
 #~ msgid "Unlinking message %s in trash...\n"
 #~ msgstr "Eliminando mensagem %s da lixeira...\n"
+
 #~ msgid "Enable thread view on summary"
 #~ msgstr "Habilitar visualização hierárquica em resumos"
+
 #~ msgid "Not yet implemented."
 #~ msgstr "Ainda não implementado."
+
 #~ msgid "/_Sumary/Unsele_ct all"
 #~ msgstr "/_Resumo/_Deselecionar todos"
+
 #~ msgid ""
 #~ "Date\n"
 #~ "from\n"
@@ -7608,22 +7515,30 @@ msgstr "Aviso de URL falsa"
 #~ "Para\n"
 #~ "Message-ID\n"
 #~ "%"
+
 #~ msgid "Printing"
 #~ msgstr "Imprimindo"
+
 #~ msgid "/_Mark/Mark _all"
 #~ msgstr "/_Marcar/_Marcar todos"
+
 #~ msgid "/_Mark/U_nmark all"
 #~ msgstr "/_Marcar/Desmarca_r todos"
+
 #~ msgid "/_Mark/M_ove marked"
 #~ msgstr "/_Marcar/_Mover marcados"
+
 #~ msgid "/_Mark/_Delete marked"
 #~ msgstr "/_Marcar/A_pagar marcados"
+
 #~ msgid "/U_nselect all"
 #~ msgstr "/_Deselecionar tudo"
+
 #~ msgid "/_Message/Reply with _quotation"
 #~ msgstr "/_Mensagem/Responder com _citação"
+
 #~ msgid "/Reply with _quotation"
 #~ msgstr "/Responder com _citação"
+
 #~ msgid "queueing message that failed to send...\n"
 #~ msgstr "mensagens na fila que falharam ao enviar...\n"
-
diff --git a/po/ro.po b/po/ro.po
index 4b60d3da..b913ebc5 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2000-08-28\n"
 "Last-Translator: Little Dragon <littledragon@altern.org>\n"
 "Language-Team: Little Dragon <littledragon@altern.org>\n"
@@ -1067,7 +1067,7 @@ msgstr ""
 "adreselor conţinute de el ? Dacă ştergeţi doar directorul, adresele\n"
 "vor fi mutate in directorul părinte."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Ştergere director"
 
@@ -1203,7 +1203,7 @@ msgstr "Groupă"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Director"
 
@@ -1638,7 +1638,7 @@ msgstr "Mesaj: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Citirea unei parţi din mesajul multipart este imposibilă."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
@@ -2284,7 +2284,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "'%c' nu poate fi inclus în numele directorului."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Directorul '%s' există deja."
@@ -2454,19 +2454,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Sunteţi sigur că doriţi să ştergeţi cutia poştală '%s'\n"
+"(Mesajele NU sunt şterse de pe disc)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ştergere director"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2477,21 +2478,21 @@ msgstr ""
 "Toate directoarele şi mesajele din '%s' vor fi şterse.\n"
 "Doriţi într-adevăr să continuaţi ?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr ""
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2500,35 +2501,35 @@ msgstr ""
 "Sunteţi sigur că doriţi să ştergeţi cutia poştală '%s'\n"
 "(Mesajele NU sunt şterse de pe disc)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Ştergere _cutie poştală"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului IMAP4 '%s' ?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Ştergere cont IMAP4"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea newsgroupului '%s' ?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Ştergere newsgroup"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului de news '%s' ?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Ştergere cont de news"
 
@@ -2544,7 +2545,7 @@ msgstr "Subiect:"
 msgid "Creating header view...\n"
 msgstr "Creare vedere antet...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Fără expeditor)"
 
@@ -3935,7 +3936,7 @@ msgstr "salvare mesaj trimis...\n"
 msgid "Find text:"
 msgstr ""
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Distincţie minuscule/majuscule"
 
@@ -5849,26 +5850,26 @@ msgstr "Antetul nu a fost definit."
 msgid "Destination folder is not specified."
 msgstr "Destinaţia nu a fost definită."
 
-#: src/prefs_filter_edit.c:1791
+#: src/prefs_filter_edit.c:1795
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1818
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Destinatarul nu a fost specificat."
 
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1844
 #, fuzzy
 msgid "Invalid action exists."
 msgstr "Lună invalidă\n"
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Antetul nu a fost definit."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: fişierul nu există\n"
@@ -5923,19 +5924,19 @@ msgid "Attachment"
 msgstr "Ataşamente"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Subiect"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "De la"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Data"
@@ -6357,7 +6358,7 @@ msgstr "ştergere newsgroup %s ...\n"
 msgid "Can't retrieve newsgroup list."
 msgstr "Lista de newsgroup-uri nu a putut fi obţinută."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Gata."
 
@@ -6366,60 +6367,60 @@ msgstr "Gata."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d newsgroup-uri recepţionate (%s citite)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 #, fuzzy
 msgid "Search messages"
 msgstr "Trimitere mesaj"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Setare automată a adreselor următoare"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Director"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Căutarea a eşuat"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Salvare"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Scanare director %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrare..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Fără Dată)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Salvare"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 #, fuzzy
 msgid "Location:"
 msgstr "Citare"
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Numele fişierului"
@@ -6810,35 +6811,35 @@ msgstr "Creare vedere text...\n"
 msgid "This message can't be displayed.\n"
 msgstr "un mesaj nu a putut fi recepţionat\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Salvare ca..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Creare mesaj nou"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "Adăugare agendă"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Adresse comună:"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr ""
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6847,7 +6848,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/ru.po b/po/ru.po
index be345c2e..d315e371 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2004-12-05 17:16+0300\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -1048,7 +1048,7 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Удалить папку"
 
@@ -1183,7 +1183,7 @@ msgstr "Группа"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Папка"
 
@@ -1602,7 +1602,7 @@ msgstr "Сообщение: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Без темы)"
@@ -2244,7 +2244,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "Символ '%c' не может входить в имя папки."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка '%s' уже существует."
@@ -2403,19 +2403,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Ошибка при удалении папки '%s'."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Удалить почтовый ящик '%s' ?\n"
+"(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Удалить папку"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2426,21 +2427,21 @@ msgstr ""
 "Все вложенные папки и сообщения из '%s' будут удалены.\n"
 "Вы действительно хотите удалить папку?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ошибка при удалении папки '%s'."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Очистка корзины"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2449,34 +2450,34 @@ msgstr ""
 "Удалить почтовый ящик '%s' ?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Удалить учетную запись IMAP4 '%s'?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Удалить учетную запись IMAP4"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Удалить группу новостей '%s'?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Удаление группы новостей"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Удалить учетную запись новостей '%s'?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Удалить учетную запись новостей"
 
@@ -2492,7 +2493,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Создание области просмотра заголовков...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Без отправителя)"
 
@@ -3774,7 +3775,7 @@ msgstr "Поиск в текущем сообщении"
 msgid "Find text:"
 msgstr "Искать текст:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Учитывать регистр"
 
@@ -5631,23 +5632,23 @@ msgstr "Не указана командная строка."
 msgid "Destination folder is not specified."
 msgstr "Папка назначения не указана."
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "Не указано имя правила."
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "Указано недопустимое условие."
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "Не указано имя правила."
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "Указано недопустимое действие."
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "Не указано условие."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "Не указано действие."
 
@@ -5698,19 +5699,19 @@ msgid "Attachment"
 msgstr "Вложение"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Дата"
@@ -6105,7 +6106,7 @@ msgstr "Не удалось получить список групп новос�
 msgid "Can't retrieve newsgroup list."
 msgstr "Не удалось получить список групп новостей."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Выполнено."
 
@@ -6114,57 +6115,57 @@ msgstr "Выполнено."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d групп новостей (%s загружено)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Поиск сообщений"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "Поиск по любому из полей:"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "Поиск по всем полям:"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Папка"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Поиск не удался"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Просмотр папки %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Фильтрация..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Нет даты)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Сохранить в папке черновиков"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Имя файла"
@@ -6513,36 +6514,36 @@ msgstr "Создание области просмотра текста...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Невозможно отобразить сообщение.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/Сохранить как..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Написать новое сообщение"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Добавить отправителя в адресную книгу"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Адреса организаций"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web-браузер"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6554,7 +6555,7 @@ msgstr ""
 "отображаемого URL (%s).\n"
 "Все равно открыть?"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sk.po b/po/sk.po
index 2293177d..c7915617 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2004-01-22 17:46+0100\n"
 "Last-Translator: Andrej Kacian <andrej@kacian.sk>\n"
 "Language-Team: Slovak <sk-i18n@lists.linux.sk>\n"
@@ -1046,7 +1046,7 @@ msgstr ""
 "Naozaj chcete zmazať priečinok A SÚČASNE všetky adresy v %s ?\n"
 "Ak zmažete len priečinok, adresy z neho sa presunú do nadradeného priečinku."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
@@ -1182,7 +1182,7 @@ msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Priečinok"
 
@@ -1609,7 +1609,7 @@ msgstr "Správa: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
@@ -2252,7 +2252,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
@@ -2413,19 +2413,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Naozaj chcete odstrániť schránku '%s' ?\n"
+"(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Odstrániť priečinok"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2436,21 +2437,21 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2459,34 +2460,34 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
@@ -2502,7 +2503,7 @@ msgstr "Predmet:"
 msgid "Creating header view...\n"
 msgstr "Vytváram náhľad hlavičky...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 
@@ -3800,7 +3801,7 @@ msgstr "Nájdi v súčasnej správe"
 msgid "Find text:"
 msgstr "Nájdi text:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Záleží na veľkosti písmen"
 
@@ -5679,25 +5680,25 @@ msgstr "Nebol zadaný príkazový riadok."
 msgid "Destination folder is not specified."
 msgstr "Nebol zadaný cieľ."
 
-#: src/prefs_filter_edit.c:1791
+#: src/prefs_filter_edit.c:1795
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1818
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Nie je určený príjemca."
 
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: súbor neexistuje\n"
@@ -5749,19 +5750,19 @@ msgid "Attachment"
 msgstr "Príloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Dátum"
@@ -6156,7 +6157,7 @@ msgstr "Nedá sa získať zoznam diskusných skupín."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nedá sa získať zoznam diskusných skupín."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Hotovo."
 
@@ -6165,58 +6166,58 @@ msgstr "Hotovo."
 msgid "%d newsgroups received (%s read)"
 msgstr "Prijatých %d diskusných skupín (prečítaných %s)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Vyhľadať v správach"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Priečinok"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Hľadanie sa nepodarilo"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Uložiť medzi koncepty"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Názov súboru"
@@ -6562,36 +6563,36 @@ msgstr "Vytváram zobrazenie textu...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Táto správa sa nedá zobraziť.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Uložiť ako..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napísať novú správu"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Pridať odosielateľa do _adresára"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Spoločná adresa"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Webový prehliadač"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6600,7 +6601,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sl.po b/po/sl.po
index 1192ecaa..870378cc 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: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+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"
@@ -1052,7 +1052,7 @@ 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:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
@@ -1187,7 +1187,7 @@ msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Mapa"
 
@@ -1615,7 +1615,7 @@ msgstr "Sporočilo: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
@@ -2256,7 +2256,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "Znaka '%c' ne more biti v imenu mape."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' že obstaja."
@@ -2418,19 +2418,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Ali naj res odstranim poštni predal '%s' ?\n"
+"(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Izbriši mapo"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2441,21 +2442,21 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2464,34 +2465,34 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbrišem račun IMAP4 '%s'?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Izbriši račun IMAP4"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbrišem novičarsko skupino '%s'?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Izbriši novičarsko skupino"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbrišem novičarski račun '%s'?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Izbriši novičarski račun"
 
@@ -2507,7 +2508,7 @@ msgstr "Zadeva:"
 msgid "Creating header view...\n"
 msgstr "Delam gledanje zaglavja...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Brez pošiljatelja)"
 
@@ -3804,7 +3805,7 @@ msgstr "Poišči v trenutnem sporočilu"
 msgid "Find text:"
 msgstr "Poišči besedilo:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Razlikuj velike in male črke"
 
@@ -5681,25 +5682,25 @@ msgstr "Ukazna vrstica ni nastavljena."
 msgid "Destination folder is not specified."
 msgstr "Cilj ni nastavljen."
 
-#: src/prefs_filter_edit.c:1791
+#: src/prefs_filter_edit.c:1795
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1818
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Naslovnik ni določen."
 
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: datoteka ne obstaja\n"
@@ -5752,19 +5753,19 @@ msgid "Attachment"
 msgstr "Priloga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Datum"
@@ -6157,7 +6158,7 @@ msgstr "Ne morem potegniti seznama novičarskih skupin."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne morem potegniti seznama novičarskih skupin."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Opravljeno."
 
@@ -6166,58 +6167,58 @@ msgstr "Opravljeno."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d sprejetih novičarskih skupin (%s prebranih)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Iskanje sporočil"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Mapa"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Iskanje neuspešno"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Brez datuma)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Shrani v imenik Draft"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Ime datoteke"
@@ -6565,36 +6566,36 @@ msgstr "Ustvarjam ogled besedila...\n"
 msgid "This message can't be displayed.\n"
 msgstr "sporočilo ne bo sprejeto\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Shrani kot..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Sestavi novo sporočilo"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Doda_j pošiljatelja v adresar"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Skupni naslov"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Spletni brskalnik"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6603,7 +6604,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sr.po b/po/sr.po
index 95f10a66..78549838 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: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -1053,7 +1053,7 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
@@ -1181,7 +1181,7 @@ msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Direktorijum"
 
@@ -1609,7 +1609,7 @@ msgstr "Poruka: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Bez teme)"
@@ -2251,7 +2251,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uvršten u ime direktorijuma."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
@@ -2413,19 +2413,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Zista premestiti direktorijum `%s' ?\n"
+"(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši direktorijum"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2436,21 +2437,21 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2459,34 +2460,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
@@ -2502,7 +2503,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Bez pošiljaoca)"
 
@@ -3800,7 +3801,7 @@ msgstr "Pronađi u trenutnoj poruci"
 msgid "Find text:"
 msgstr "Pronađi tekst:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Osjetljiv na velika/mala slova"
 
@@ -5676,25 +5677,25 @@ msgstr "Linija za neredbe nije podešena."
 msgid "Destination folder is not specified."
 msgstr "Odredište nije postavljeno."
 
-#: src/prefs_filter_edit.c:1791
+#: src/prefs_filter_edit.c:1795
+msgid "Invalid condition exists."
+msgstr ""
+
+#: src/prefs_filter_edit.c:1818
 #, fuzzy
 msgid "Rule name is not specified."
 msgstr "Primalac nije upisan."
 
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
-msgid "Invalid condition exists."
-msgstr ""
-
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr ""
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 #, fuzzy
 msgid "Condition not exist."
 msgstr "Linija za neredbe nije podešena."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 #, fuzzy
 msgid "Action not exist."
 msgstr "%s: datoteka ne postoji\n"
@@ -5747,19 +5748,19 @@ msgid "Attachment"
 msgstr "Dodatak"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Datum"
@@ -6155,7 +6156,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:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Gotovo."
 
@@ -6164,59 +6165,59 @@ msgstr "Gotovo."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d news grupa primljeno (%s pročitano)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Pretraži poruke"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr ""
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Automatski postavi sledeće adrese"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Direktorijum"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Traži direktorijum"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Traži direktorijum"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Traži direktorijum"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 #, fuzzy
 msgid "Location:"
 msgstr "Citat"
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Ime datoteke"
@@ -6563,36 +6564,36 @@ msgstr "Stvaranje pregleda teksta...\n"
 msgid "This message can't be displayed.\n"
 msgstr "poruka neće biti primljena\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/S_ačuvaj kao"
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Napiši novu poruku"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Dod_aj pošiljaoca u adresar"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Uobičajene adrese"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Web čitač"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6601,7 +6602,7 @@ msgid ""
 "Open it anyway?"
 msgstr ""
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/sv.po b/po/sv.po
index 9fc4a8e1..6f2b2710 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2004-12-05 14:40+0100\n"
 "Last-Translator: Roger Lindmark <roger.lindmark@bredband.net>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -1050,7 +1050,7 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
@@ -1178,7 +1178,7 @@ msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Mapp"
 
@@ -1573,7 +1573,7 @@ msgstr "Meddelande: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
@@ -2209,7 +2209,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" får inte finnas i mappnamn."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
@@ -2367,19 +2367,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Kan inte flytta mappen \"%s\"."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Vill du verkligen ta bort brevlådan \"%s\" ?\n"
+"(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ta bort mapp"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2392,20 +2393,20 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Töm papperskorgen"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 msgid "Delete all messages in the trash folder?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2414,34 +2415,34 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
@@ -2457,7 +2458,7 @@ msgstr "Ämne:"
 msgid "Creating header view...\n"
 msgstr "Skapar brevhuvudvy...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Inget Från)"
 
@@ -3728,7 +3729,7 @@ msgstr "Sök i aktuellt meddelande"
 msgid "Find text:"
 msgstr "Söktext:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Skiftlägeskänslig"
 
@@ -5554,23 +5555,23 @@ msgstr "Kommando är inte angivet."
 msgid "Destination folder is not specified."
 msgstr "Destinationsmapp är inte angiven."
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "Regelnamn är inte angivet."
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "Ogiltigt villkor existerar."
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "Regelnamn är inte angivet."
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "Ogiltig åtgärd existerar."
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "Villkor saknas."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "Åtgärd saknas"
 
@@ -5620,19 +5621,19 @@ msgid "Attachment"
 msgstr "Bilaga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Datum"
@@ -6027,7 +6028,7 @@ msgstr "Kan inte hämta grupplista."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan inte hämta grupplista."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Färdig."
 
@@ -6036,57 +6037,57 @@ msgstr "Färdig."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d diskussionsgrupper mottagna (%s lästa)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Sök meddelanden"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "Matcha någon av följande"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "Matcha alla av följande"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Mapp"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Sökning misslyckades"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Spara i utkastsmapp"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Filnamn"
@@ -6428,31 +6429,31 @@ msgstr "Skapar textvy...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Detta meddelande kan inte visas.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "S_para denna bild som..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 msgid "Compose _new message"
 msgstr "Skriv _nytt meddelande"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 msgid "Add to address _book..."
 msgstr "Lägg till adress_boken"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 msgid "Copy this add_ress"
 msgstr "Kopiera denna ad_ress"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr "_Öppna med Webbläsare"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "Kopiera denna _länk"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6465,7 +6466,7 @@ msgstr ""
 "\n"
 "Öppna den ändå?"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr "Fejkad URL varning"
 
diff --git a/po/tr.po b/po/tr.po
index a17a5e10..9f5348ff 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2004-12-03 11:44+0200\n"
 "Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
 "Language-Team:  <gnome-turk@gnome.org>\n"
@@ -1050,7 +1050,7 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Dizini sil"
 
@@ -1183,7 +1183,7 @@ msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Dizin"
 
@@ -1602,7 +1602,7 @@ msgstr "İleti: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Konu yok)"
@@ -2244,7 +2244,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin adı içinde olamaz."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
@@ -2403,19 +2403,20 @@ msgid "Can't move the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"`%s' posta kutusu kaldırılsın mı?\n"
+"(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Dizini sil"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2426,21 +2427,21 @@ msgstr ""
 "`%s' altındaki tüm dizinler ve mesajlar silinecek.\n"
 "Devam etmek istediğinizden emin misiniz?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2449,34 +2450,34 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesabı silinsin mi?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesabını sil"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesabı silinsin mi?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Haber grubu hesabını sil"
 
@@ -2492,7 +2493,7 @@ msgstr "Konu:"
 msgid "Creating header view...\n"
 msgstr "Başlık görünümü oluşturuluyor...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Kimden satırı yok)"
 
@@ -3772,7 +3773,7 @@ msgstr "Şuanki mesajta bul"
 msgid "Find text:"
 msgstr "Metni bul:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Durum duyarlılığı"
 
@@ -5630,23 +5631,23 @@ msgstr "Komut belirtilmedi."
 msgid "Destination folder is not specified."
 msgstr "Hedef dizin belirtilmedi."
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "Kural adı belirtilmedi."
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "Geçersiz durum bulunuyor."
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "Kural adı belirtilmedi."
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "Geçersiz eylem bulunuyor."
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "Durum bulunamadı."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "Eylem bulunamadı."
 
@@ -5697,19 +5698,19 @@ msgid "Attachment"
 msgstr "Ek"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Tarih"
@@ -6103,7 +6104,7 @@ msgstr "Haber grubu listesi alınamadı."
 msgid "Can't retrieve newsgroup list."
 msgstr "Haber grubu listesi alınamadı."
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Tamamlandı."
 
@@ -6112,57 +6113,57 @@ msgstr "Tamamlandı."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d haber grubu alındı (%s okundu)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "İletilerde ara"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "Aşağıdaki herhangi bir kural eşleşirse"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "Aşağıdaki tüm koşullar eşleşirse"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Dizin"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Aramada hata oluştu"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Tarih Yok)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Taslak dizinine kaydet"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Dosya adı"
@@ -6511,36 +6512,36 @@ msgstr "Metin görünüm oluşturuluyor...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Bu mesaj görüntülenemiyor.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 #, fuzzy
 msgid "Sa_ve this image as..."
 msgstr "/_Farklı kaydet..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "Yeni ileti düzenle"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/Göndericiyi adres defterine ekle"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "Ortak adres"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "Tarayıcı"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr ""
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6552,7 +6553,7 @@ msgstr ""
 "görünenden (%s) farklı.\n"
 "Yine de açılsın mı?"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/uk.po b/po/uk.po
index 62248212..1a8a0414 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2005-10-22 17:21+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -1054,7 +1054,7 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Видалити папку"
 
@@ -1181,7 +1181,7 @@ msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Папка"
 
@@ -1576,7 +1576,7 @@ msgstr "Лист: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Без теми)"
@@ -2211,7 +2211,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може міститись в назві папки."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка `%s' вже існує."
@@ -2369,19 +2369,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Не вдалось перенести папку `%s'."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Справді видалити скриньку `%s' ?\n"
+"(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Видалити папку"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2394,20 +2395,20 @@ msgstr ""
 "\n"
 "Справді бажаєте видалити?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 msgid "Delete all messages in the trash folder?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2416,34 +2417,34 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Видалити скриньку"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Справді видалити обліковий запис IMAP4 `%s'?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Видалити обліковий запис IMAP4"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Дійсно видалити конференцію `%s'?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Видалити конференцію"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Дійсно видалити обліковий запис конференції `%s'?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Видалити обліковий запис конференції"
 
@@ -2459,7 +2460,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Створюємо область перегляду заголовка...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Без відправника)"
 
@@ -3731,7 +3732,7 @@ msgstr "Знайти в поточному листі"
 msgid "Find text:"
 msgstr "Знайти текст:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Враховувати регістр"
 
@@ -5555,23 +5556,23 @@ msgstr "Не задано команду."
 msgid "Destination folder is not specified."
 msgstr "Папку призначення не вказано."
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "Не вказано назву правила."
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "Існує непридатна умова."
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "Не вказано назву правила."
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "Існує непридатна дія."
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "Умова не існує."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "Дія не існує."
 
@@ -5621,19 +5622,19 @@ msgid "Attachment"
 msgstr "Вкладення"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Від"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Дата"
@@ -6027,7 +6028,7 @@ msgstr "Не вдалось отримати список конференцій
 msgid "Can't retrieve newsgroup list."
 msgstr "Не вдалось отримати список конференцій"
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Виконано."
 
@@ -6036,57 +6037,57 @@ msgstr "Виконано."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d конференцій отримано (%s прочитано)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Шукати повідомлення"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "Якщо виконано будь-яку з умов"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "Якщо виконано всі умови"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Папка"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Невдача пошуку"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Зберегти в папці чернеток"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Перечитуємо папку %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Фільтрування..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Без дати)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Зберегти в папці чернеток"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Ім'я файлу"
@@ -6428,31 +6429,31 @@ msgstr "Створюємо область перегляду тексту...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Цей лист неможливо відобразити.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "/Зберегти зображення як..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 msgid "Compose _new message"
 msgstr "Створити новий лист"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 msgid "Add to address _book..."
 msgstr "Додати до адресної книги"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 msgid "Copy this add_ress"
 msgstr "Копіювати цю адресу"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr "Відкрити Web-браузером"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "Скопіювати посилання"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6465,7 +6466,7 @@ msgstr ""
 "\n"
 "Все ж відкрити?"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr "Попередження: підміна URL"
 
diff --git a/po/vi.po b/po/vi.po
index 9e904059..58f693de 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2005-11-30 23:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -1032,7 +1032,7 @@ msgstr ""
 "Bạn có muốn xoá thư mục VÀ mọi địa chỉ trong `%s' ?\n"
 "Nếu chỉ xoá thư mục, các địa chỉ sẽ được chuyển đến thư mục cấp cao hơn."
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
@@ -1163,7 +1163,7 @@ msgstr "Nhóm"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "Thư mục"
 
@@ -1558,7 +1558,7 @@ msgstr "Thư: %s"
 msgid "Can't get the part of multipart message."
 msgstr "Không thể lấy thành phần cho thư nhiều thành phần."
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
@@ -2194,7 +2194,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "`%c' không được có trong tên thư mục."
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Thư mục `%s' đã có trước."
@@ -2352,19 +2352,20 @@ msgid "Can't move the folder `%s'."
 msgstr "Không thể di chuyển thư mục `%s'."
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"Thực sự muốn xoá hộp thư `%s' ?\n"
+"(Thư sẽ KHÔNG bị xoá khỏi ổ cứng)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Xoá thư mục"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2377,21 +2378,21 @@ msgstr ""
 "\n"
 "Bạn có thực sự muốn xoá không?"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Không thể xoá thư mục `%s'."
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "Đổi rác"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2400,34 +2401,34 @@ msgstr ""
 "Thực sự muốn xoá hộp thư `%s' ?\n"
 "(Thư sẽ KHÔNG bị xoá khỏi ổ cứng)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản IMAP4 `%s'?"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "Xoá tài khoản IMAP4"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Thực sự muốn xoá nhóm tin `%s'?"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "Xoá nhóm tin"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản tin tức `%s'?"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "Xoá tài khoản tin tức"
 
@@ -2443,7 +2444,7 @@ msgstr "Tiêu đề:"
 msgid "Creating header view...\n"
 msgstr "Đang tạo khung xem header...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(Không rõ người gửi)"
 
@@ -3718,7 +3719,7 @@ msgstr "Tìm trong thư hiện tại"
 msgid "Find text:"
 msgstr "Tìm văn bản:"
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "Phân biệt chữ hoa/thường"
 
@@ -5545,23 +5546,23 @@ msgstr "Chưa chỉ định lệnh."
 msgid "Destination folder is not specified."
 msgstr "Chưa chỉ định thư mục đích."
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "Chưa đặt tên quy tắc."
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "Tồn tại điều kiện không hợp lệ."
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "Chưa đặt tên quy tắc."
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "Tồn tại hành động không hợp lệ."
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "Điều kiện không tồn tại."
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "Hành động không tồn tại."
 
@@ -5612,19 +5613,19 @@ msgid "Attachment"
 msgstr "Đính kèm"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "Tiêu đề"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "Người gửi"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "Thời gian"
@@ -6016,7 +6017,7 @@ msgstr "Không lấy được danh sách nhóm tin"
 msgid "Can't retrieve newsgroup list."
 msgstr "Không lấy được danh sách nhóm tin"
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "Xong."
 
@@ -6025,57 +6026,57 @@ msgstr "Xong."
 msgid "%d newsgroups received (%s read)"
 msgstr "Nhận được %d nhóm tin (đã đọc %s)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "Tìm thư"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "Khớp với bất kì phần nào dưới đây"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "Khớp với tất cả các phần dưới đây"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "Thư mục"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Tìm kiếm thất bại"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "Gửi vào thư mục nháp"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "Đang quét thư mục %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "Đang lọc..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Không ngày tháng)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "Gửi vào thư mục nháp"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "Tên tập tin"
@@ -6422,31 +6423,31 @@ msgstr "Đang tạo khung xem văn bản...\n"
 msgid "This message can't be displayed.\n"
 msgstr "Không thể hiển thị được thư này.\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "_Lưu hình ảnh này là..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 msgid "Compose _new message"
 msgstr "Soạn _thư mới"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 msgid "Add to address _book..."
 msgstr "Thêm vào _sổ địa chỉ..."
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 msgid "Copy this add_ress"
 msgstr "_Chép địa chỉ này"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr "_Mở với trình duyệt web"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "Sao chép liên _kết này"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6459,7 +6460,7 @@ msgstr ""
 "\n"
 "Vẫn mở nó?"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr "Cảnh báo URL lừa đảo"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 3012c67e..798b68fe 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2005-03-17 09:22+0800\n"
 "Last-Translator: Wang Jian <lark@linux.net.cn>\n"
 "Language-Team: zh_CN <i18n-translation@lists.linux.net.cn>\n"
@@ -1043,7 +1043,7 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "删除文件夹"
 
@@ -1169,7 +1169,7 @@ msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "文件夹"
 
@@ -1567,7 +1567,7 @@ msgstr "邮件：%s"
 msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "(没有主题)"
@@ -2206,7 +2206,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
@@ -2365,19 +2365,20 @@ msgid "Can't move the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"真的要删除邮件箱“%s”？\n"
+"(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "删除文件夹"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2388,21 +2389,21 @@ msgstr ""
 "“%s”下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2411,34 +2412,34 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号“%s”？"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -2454,7 +2455,7 @@ msgstr "标题："
 msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "(没有发件人)"
 
@@ -3725,7 +3726,7 @@ msgstr "在当前邮件中查找"
 msgid "Find text:"
 msgstr "查找文字："
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "区分大小写"
 
@@ -5563,23 +5564,23 @@ msgstr "没有指定命令行。"
 msgid "Destination folder is not specified."
 msgstr "没有指定目标文件夹。"
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "没有指定规则名称。"
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "存在无效的条件。"
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "没有指定规则名称。"
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "存在无效的动作。"
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "不存在的条件。"
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "不存在的动作。"
 
@@ -5630,19 +5631,19 @@ msgid "Attachment"
 msgstr "附件"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "日期"
@@ -6037,7 +6038,7 @@ msgstr "无法取回新闻组列表。"
 msgid "Can't retrieve newsgroup list."
 msgstr "无法取回新闻组列表。"
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "完成。"
 
@@ -6046,57 +6047,57 @@ msgstr "完成。"
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收 %d 个新闻组(已读取 %s)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "查找邮件"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "匹配以下任何"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "匹配以下所有"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "文件夹"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "搜索失败"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "保存到草稿文件夹"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(没有日期)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "保存到草稿文件夹"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "文件名"
@@ -6440,35 +6441,35 @@ msgstr "正在创建文本视图...\n"
 msgid "This message can't be displayed.\n"
 msgstr "无法显示该邮件。\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "图像另存为(_V)..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 #, fuzzy
 msgid "Compose _new message"
 msgstr "撰写新邮件"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 #, fuzzy
 msgid "Add to address _book..."
 msgstr "/添加发件人到地址簿(_K)"
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 #, fuzzy
 msgid "Copy this add_ress"
 msgstr "复制链接(_L)"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 #, fuzzy
 msgid "_Open with Web browser"
 msgstr "网页浏览器"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "复制链接(_L)"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, fuzzy, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6480,7 +6481,7 @@ msgstr ""
 "显示的 URL (%s) 不同。\n"
 "仍然要打开吗？"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr ""
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 8b606157..76f304c1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"POT-Creation-Date: 2006-01-06 18:23+0900\n"
 "PO-Revision-Date: 2005-10-25 16:23+0800\n"
 "Last-Translator: Wei-Lun Chao <chaoweilun@pcmail.com.tw>\n"
 "Language-Team: Chinese (traditional) <zh-l10n@linux.org.tw>\n"
@@ -1046,7 +1046,7 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1674 src/folderview.c:2308
+#: src/addressbook.c:1674 src/folderview.c:2307
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
@@ -1174,7 +1174,7 @@ msgstr "群組"
 
 #. special folder setting (maybe these options are redundant)
 #: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
-#: src/summary_search.c:367
+#: src/summary_search.c:370
 msgid "Folder"
 msgstr "資料夾"
 
@@ -1569,7 +1569,7 @@ msgstr "郵件：%s"
 msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
-#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:640
+#: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:625
 #: src/summaryview.c:1979
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
@@ -2203,7 +2203,7 @@ msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有「%c」這個字元。"
 
 #: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
-#: src/summary_search.c:989
+#: src/summary_search.c:985
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾「%s」已存在。"
@@ -2361,19 +2361,20 @@ msgid "Can't move the folder `%s'."
 msgstr "無法移動資料夾「%s」。"
 
 #: src/folderview.c:2297
-#, c-format
+#, fuzzy, c-format
 msgid ""
-"The search folder '%s' will be deleted.\n"
-"The real messages are not deleted.\n"
-"Really delete it?"
+"Delete the search folder '%s' ?\n"
+"The real messages are not deleted."
 msgstr ""
+"確定要移除信箱 %s？\n"
+"注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2300
+#: src/folderview.c:2299
 #, fuzzy
 msgid "Delete search folder"
 msgstr "刪除資料夾"
 
-#: src/folderview.c:2305
+#: src/folderview.c:2304
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2386,20 +2387,20 @@ msgstr ""
 "\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:2337 src/folderview.c:2343
+#: src/folderview.c:2336 src/folderview.c:2342
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2379
+#: src/folderview.c:2378
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:2380
+#: src/folderview.c:2379
 msgid "Delete all messages in the trash folder?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2419
+#: src/folderview.c:2418
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2408,34 +2409,34 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2420
 msgid "Remove mailbox"
 msgstr "移除信箱"
 
-#: src/folderview.c:2471
+#: src/folderview.c:2470
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2472
+#: src/folderview.c:2471
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2625
+#: src/folderview.c:2624
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組「%s」嗎？"
 
-#: src/folderview.c:2626
+#: src/folderview.c:2625
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2676
+#: src/folderview.c:2675
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號「%s」嗎？"
 
-#: src/folderview.c:2677
+#: src/folderview.c:2676
 msgid "Delete news account"
 msgstr "刪除帳號"
 
@@ -2451,7 +2452,7 @@ msgstr "主旨："
 msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
-#: src/headerview.c:180 src/summary_search.c:641 src/summaryview.c:1982
+#: src/headerview.c:180 src/summary_search.c:626 src/summaryview.c:1982
 msgid "(No From)"
 msgstr "（沒有來源）"
 
@@ -3714,7 +3715,7 @@ msgstr "在目前郵件中尋找"
 msgid "Find text:"
 msgstr "尋找文字："
 
-#: src/message_search.c:141 src/summary_search.c:323
+#: src/message_search.c:141 src/summary_search.c:326
 msgid "Case sensitive"
 msgstr "區分大小寫"
 
@@ -5527,23 +5528,23 @@ msgstr "未設定執行指令。"
 msgid "Destination folder is not specified."
 msgstr "目的資料夾未設定。"
 
-#: src/prefs_filter_edit.c:1791
-msgid "Rule name is not specified."
-msgstr "沒有指定規則名稱。"
-
-#: src/prefs_filter_edit.c:1812 src/summary_search.c:466
+#: src/prefs_filter_edit.c:1795
 msgid "Invalid condition exists."
 msgstr "有不合法的條件。"
 
-#: src/prefs_filter_edit.c:1828
+#: src/prefs_filter_edit.c:1818
+msgid "Rule name is not specified."
+msgstr "沒有指定規則名稱。"
+
+#: src/prefs_filter_edit.c:1844
 msgid "Invalid action exists."
 msgstr "有不合法的執行指令。"
 
-#: src/prefs_filter_edit.c:1837
+#: src/prefs_filter_edit.c:1853
 msgid "Condition not exist."
 msgstr "未設定條件。"
 
-#: src/prefs_filter_edit.c:1839
+#: src/prefs_filter_edit.c:1855
 msgid "Action not exist."
 msgstr "指定的指令不存在。"
 
@@ -5593,19 +5594,19 @@ msgid "Attachment"
 msgstr "附加檔案"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/summary_search.c:368
+#: src/prefs_summary_column.c:73 src/summary_search.c:371
 #: src/summaryview.c:4567
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/summary_search.c:369
+#: src/prefs_summary_column.c:74 src/summary_search.c:372
 #: src/summaryview.c:4570
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/summary_search.c:370
+#: src/prefs_summary_column.c:75 src/summary_search.c:373
 #: src/summaryview.c:4572
 msgid "Date"
 msgstr "日期"
@@ -5999,7 +6000,7 @@ msgstr "無法取得收件人或收件新聞群組名單。"
 msgid "Can't retrieve newsgroup list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/subscribedialog.c:523 src/summary_search.c:518 src/summaryview.c:767
+#: src/subscribedialog.c:523 src/summary_search.c:503 src/summaryview.c:767
 msgid "Done."
 msgstr "完成"
 
@@ -6008,57 +6009,57 @@ msgstr "完成"
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收 %d 個新聞群組 (%s 已讀)"
 
-#: src/summary_search.c:231
+#: src/summary_search.c:234
 msgid "Search messages"
 msgstr "尋找郵件(_S)"
 
-#: src/summary_search.c:254
+#: src/summary_search.c:257
 msgid "Match any of the following"
 msgstr "下列任一條件符合"
 
-#: src/summary_search.c:256
+#: src/summary_search.c:259
 msgid "Match all of the following"
 msgstr "下列所有條件均符合"
 
-#: src/summary_search.c:300
+#: src/summary_search.c:303
 #, fuzzy
 msgid "Folder:"
 msgstr "資料夾"
 
-#: src/summary_search.c:318
+#: src/summary_search.c:321
 #, fuzzy
 msgid "Search subfolders"
 msgstr "搜尋失敗"
 
-#: src/summary_search.c:392
+#: src/summary_search.c:395
 #, fuzzy
 msgid "_Save as search folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/summary_search.c:542
+#: src/summary_search.c:527
 #, fuzzy, c-format
 msgid "Searching %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/summary_search.c:570
+#: src/summary_search.c:555
 #, fuzzy, c-format
 msgid "Searching %s (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summary_search.c:649 src/summaryview.c:1920
+#: src/summary_search.c:634 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
-#: src/summary_search.c:831
+#: src/summary_search.c:823
 #, fuzzy
 msgid "Save as search folder"
 msgstr "儲存至草稿資料夾"
 
-#: src/summary_search.c:852
+#: src/summary_search.c:844
 msgid "Location:"
 msgstr ""
 
-#: src/summary_search.c:867
+#: src/summary_search.c:859
 #, fuzzy
 msgid "Folder name:"
 msgstr "檔名"
@@ -6400,31 +6401,31 @@ msgstr "產生文字視窗...\n"
 msgid "This message can't be displayed.\n"
 msgstr "無法顯示郵件。\n"
 
-#: src/textview.c:1907
+#: src/textview.c:1919
 msgid "Sa_ve this image as..."
 msgstr "圖片另存新檔(_V)..."
 
-#: src/textview.c:1923
+#: src/textview.c:1935
 msgid "Compose _new message"
 msgstr "編寫新郵件(_N)"
 
-#: src/textview.c:1925
+#: src/textview.c:1937
 msgid "Add to address _book..."
 msgstr "將寄信人加入通訊錄(_B)..."
 
-#: src/textview.c:1927
+#: src/textview.c:1939
 msgid "Copy this add_ress"
 msgstr "複製此通訊地址(_R)"
 
-#: src/textview.c:1930
+#: src/textview.c:1942
 msgid "_Open with Web browser"
 msgstr "以瀏覽器開啟(_O)"
 
-#: src/textview.c:1932
+#: src/textview.c:1944
 msgid "Copy this _link"
 msgstr "複製此連接(_L)"
 
-#: src/textview.c:2075
+#: src/textview.c:2087
 #, c-format
 msgid ""
 "The real URL (%s) is different from\n"
@@ -6436,7 +6437,7 @@ msgstr ""
 "\n"
 "確定要開啟嗎？"
 
-#: src/textview.c:2080
+#: src/textview.c:2092
 msgid "Fake URL warning"
 msgstr "假的 URL 警告訊息"